@lvce-editor/quick-pick-worker 4.13.2 → 4.14.0

package/dist/quickPickWorkerMain.js

@@ -157,7 +157,6 @@ const walkValue = (value, transferrables, isTransferrable) => {
     for (const property of Object.values(value)) {
       walkValue(property, transferrables, isTransferrable);
     }
-    return;
   }
 };
 const getTransferrables = value => {
@@ -311,7 +310,14 @@ class IpcError extends VError {
       const cause = new Error(message);
       // @ts-ignore
       cause.code = code;
-      cause.stack = stack;
+      if (stack) {
+        Object.defineProperty(cause, 'stack', {
+          configurable: true,
+          enumerable: false,
+          value: stack,
+          writable: true
+        });
+      }
       super(cause, betterMessage);
     } else {
       super(betterMessage);
@@ -1020,6 +1026,34 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+
 const create$8 = async ({
   commandMap,
   isMessagePortOpen = true,
@@ -1055,34 +1089,6 @@ const create$7 = async ({
   });
 };
 
-const createSharedLazyRpc = factory => {
-  let rpcPromise;
-  const getOrCreate = () => {
-    if (!rpcPromise) {
-      rpcPromise = factory();
-    }
-    return rpcPromise;
-  };
-  return {
-    async dispose() {
-      const rpc = await getOrCreate();
-      await rpc.dispose();
-    },
-    async invoke(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invoke(method, ...params);
-    },
-    async invokeAndTransfer(method, ...params) {
-      const rpc = await getOrCreate();
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    async send(method, ...params) {
-      const rpc = await getOrCreate();
-      rpc.send(method, ...params);
-    }
-  };
-};
-
 const create$6 = async ({
   commandMap,
   isMessagePortOpen,
@@ -1129,7 +1135,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$6 = (id, rpc) => {
+const set$8 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$2 = id => {
@@ -1162,7 +1168,7 @@ const create$4 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$6(rpcId, mockRpc);
+      set$8(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$1(rpcId);
@@ -1171,79 +1177,97 @@ const create$4 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$6(rpcId, rpc);
+      set$8(rpcId, rpc);
     }
   };
 };
 
+const Div = 4;
+const Input = 6;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const Reference = 100;
+
 const EditorWorker = 99;
 const ExtensionManagementWorker = 9006;
+const RendererProcess = 1670;
 const RendererWorker = 1;
 
 const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
 const SetPatches = 'Viewlet.setPatches';
 
 const FocusQuickPickInput = 20;
 
 const {
-  invoke: invoke$4,
-  set: set$5
+  invoke: invoke$6,
+  set: set$7
 } = create$4(EditorWorker);
 const getLines = async editorUid => {
-  const lines = await invoke$4('Editor.getLines2', editorUid);
+  const lines = await invoke$6('Editor.getLines2', editorUid);
   return lines;
 };
 
 const {
-  invoke: invoke$3,
-  set: set$4
+  invoke: invoke$5,
+  set: set$6
 } = create$4(ExtensionManagementWorker);
 const getLanguages = (platform, assetDir) => {
-  return invoke$3('Extensions.getLanguages', platform, assetDir);
+  return invoke$5('Extensions.getLanguages', platform, assetDir);
 };
 
 const {
-  invoke: invoke$2,
-  set: set$3
+  invoke: invoke$4,
+  set: set$5
 } = create$4(7013);
 
 const {
-  invoke: invoke$1,
+  invoke: invoke$3,
+  set: set$4
+} = create$4(RendererProcess);
+
+const {
+  invoke: invoke$2,
   invokeAndTransfer,
-  set: set$2
+  set: set$3
 } = create$4(RendererWorker);
 const sendMessagePortToEditorWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToEditorWorker', port, command, rpcId);
 };
 const setFocus = key => {
-  return invoke$1('Focus.setFocus', key);
+  return invoke$2('Focus.setFocus', key);
 };
 const getFileIcon = async options => {
-  return invoke$1('IconTheme.getFileIcon', options);
+  return invoke$2('IconTheme.getFileIcon', options);
 };
 const getFolderIcon = async options => {
-  return invoke$1('IconTheme.getFolderIcon', options);
+  return invoke$2('IconTheme.getFolderIcon', options);
 };
 const closeWidget$1 = async widgetId => {
-  return invoke$1('Viewlet.closeWidget', widgetId);
+  return invoke$2('Viewlet.closeWidget', widgetId);
 };
 const sendMessagePortToFileSearchWorker2 = async (port, rpcId = 0) => {
   const command = 'FileSearch.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSearchWorker', port, command, rpcId);
 };
 const getActiveEditorId = () => {
-  return invoke$1('GetActiveEditor.getActiveEditorId');
+  return invoke$2('GetActiveEditor.getActiveEditorId');
 };
 const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   const command = 'Extensions.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
 const openUri$1 = async (uri, focus, options) => {
-  await invoke$1('Main.openUri', uri, focus, options);
+  await invoke$2('Main.openUri', {
+    ...options,
+    focus,
+    uri
+  });
 };
 const showErrorDialog$1 = async errorInfo => {
-  await invoke$1('ErrorHandling.showErrorDialog', errorInfo);
+  await invoke$2('ErrorHandling.showErrorDialog', errorInfo);
 };
 
 const closeWidget = async id => {
@@ -1251,11 +1275,11 @@ const closeWidget = async id => {
   await closeWidget$1(id);
 };
 
-const state$3 = {
+const state$4 = {
   value: 0
 };
 const create$3 = () => {
-  return ++state$3.value;
+  return ++state$4.value;
 };
 
 const callbacks$1 = Object.create(null);
@@ -1319,7 +1343,7 @@ const close = async state => {
         }
         executeCallback(resolveId, result);
       } else {
-        await invoke$1('QuickPick.executeCallback', resolveId, result);
+        await invoke$2('QuickPick.executeCallback', resolveId, result);
       }
     }
   }
@@ -1480,7 +1504,7 @@ const {
   get: get$1,
   getCommandIds,
   registerCommands,
-  set: set$1,
+  set: set$2,
   wrapAsyncCommand,
   wrapCommand
 } = create$2();
@@ -1688,7 +1712,7 @@ const create = (uid, uri, listItemHeight, x, y, width, height, platform, args, _
     platform,
     value: ''
   };
-  set$1(uid, state, state);
+  set$2(uid, state, state);
 };
 
 const RenderItems = 1;
@@ -1747,7 +1771,7 @@ const dispose = uid => {
 };
 
 const setColorTheme = id => {
-  return invoke$1(/* ColorTheme.setColorTheme */'ColorTheme.setColorTheme', /* colorThemeId */id);
+  return invoke$2(/* ColorTheme.setColorTheme */'ColorTheme.setColorTheme', /* colorThemeId */id);
 };
 
 const focusPick$1 = async pick => {
@@ -2394,7 +2418,7 @@ const getFinalDeltaY = (height, itemHeight, itemsLength) => {
 };
 
 const getColorThemeNames = async (assetDir, platform) => {
-  return invoke$1('ColorTheme.getColorThemeNames', assetDir, platform);
+  return invoke$2('ColorTheme.getColorThemeNames', assetDir, platform);
 };
 
 const toProtoVisibleItem$4 = name => {
@@ -2472,21 +2496,21 @@ const warn = (...args) => {
   console.warn(...args);
 };
 
-const state$2 = {
+const state$3 = {
   menuEntries: []
 };
 const getAll = async () => {
   try {
     // @ts-ignore
-    const entries = await invoke$1('Layout.getAllQuickPickMenuEntries');
+    const entries = await invoke$2('Layout.getAllQuickPickMenuEntries');
     return entries || [];
   } catch {
     // ignore
   }
-  return state$2.menuEntries;
+  return state$3.menuEntries;
 };
 const add$1 = menuEntries => {
-  state$2.menuEntries = [...state$2.menuEntries, ...menuEntries];
+  state$3.menuEntries = [...state$3.menuEntries, ...menuEntries];
 };
 
 const changeLanguageModePick = {
@@ -2513,7 +2537,7 @@ const getExtensionPicks = async (assetDir, platform) => {
     // Assert.number(platform)
     // TODO ask extension management worker directly
     // TODO don't call this every time, cache the results
-    const extensionPicks = await invoke$1('ExtensionHost.getCommands', assetDir, platform);
+    const extensionPicks = await invoke$2('ExtensionHost.getCommands', assetDir, platform);
     if (!extensionPicks) {
       return [];
     }
@@ -2557,7 +2581,7 @@ const getPicks$c = async (value, args, {
   return converted;
 };
 
-const state$1 = {
+const state$2 = {
   args: [],
   items: Object.create(null)
 };
@@ -2567,24 +2591,24 @@ const idState = {
 };
 const add = items => {
   const nextId = ++idState.value;
-  state$1.items[nextId] = items;
+  state$2.items[nextId] = items;
   return nextId;
 };
 const get = id => {
-  return state$1.items[id] || [];
+  return state$2.items[id] || [];
 };
 const remove = id => {
-  delete state$1.items[id];
+  delete state$2.items[id];
 };
 
-const state = {
+const state$1 = {
   rpc: undefined
 };
-const set = newRpc => {
-  state.rpc = newRpc;
+const set$1 = newRpc => {
+  state$1.rpc = newRpc;
 };
-const invoke = (method, ...args) => {
-  return state.rpc.invoke(method, ...args);
+const invoke$1 = (method, ...args) => {
+  return state$1.rpc.invoke(method, ...args);
 };
 
 const toProtoVisibleItem$2 = item => {
@@ -2610,11 +2634,11 @@ const toProtoVisibleItem$2 = item => {
   };
 };
 const getPicks$b = async (searchValue, args) => {
-  state$1.args = args;
+  state$2.args = args;
   const options = args.at(-1);
   let items;
   if (options?.mode === 'quickInput') {
-    items = searchValue === '' && options?.customItemsId ? get(options.customItemsId) : await invoke('ExtensionHostQuickPick.renderQuickInput', options.quickInputId, searchValue);
+    items = searchValue === '' && options?.customItemsId ? get(options.customItemsId) : await invoke$1('ExtensionHostQuickPick.renderQuickInput', options.quickInputId, searchValue);
   } else {
     items = options?.customItemsId ? get(options.customItemsId) : args[1] || [];
   }
@@ -2625,11 +2649,11 @@ const getPicks$b = async (searchValue, args) => {
 const emptyMatches = [];
 
 const getWorkspacePath = async () => {
-  return invoke$1('Workspace.getPath');
+  return invoke$2('Workspace.getPath');
 };
 
 const searchFile$1 = async (path, value, prepare, assetDir) => {
-  const result = await invoke$2('FileSearch.searchFile', path, value, prepare, assetDir);
+  const result = await invoke$4('FileSearch.searchFile', path, value, prepare, assetDir);
   return result;
 };
 
@@ -2972,7 +2996,7 @@ const uniq = array => {
   return [...new Set(array)];
 };
 const getRecentlyOpened = async () => {
-  const recentlyOpened = await invoke$1(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
+  const recentlyOpened = await invoke$2(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
   return uniq(recentlyOpened);
 };
 
@@ -3064,7 +3088,7 @@ const selectPickBuiltin = async item => {
   }
   const args = item.args || [];
   // TODO ids should be all numbers for efficiency -> also directly can call command
-  await invoke$1(item.id, ...args);
+  await invoke$2(item.id, ...args);
   if (shouldHide(item)) {
     return {
       command: Hide
@@ -3077,7 +3101,7 @@ const selectPickBuiltin = async item => {
 const selectPickExtension = async item => {
   const id = item.id.slice(4); // TODO lots of string allocation with 'ext.' find a better way to separate builtin commands from extension commands
   try {
-    await invoke$1('ExtensionHost.executeCommand', id);
+    await invoke$2('ExtensionHost.executeCommand', id);
   } catch (error) {
     await handleError(error, false);
     await showErrorDialog(error);
@@ -3110,7 +3134,7 @@ const getOptions = args => {
 const selectPick$8 = async (_pick, value) => {
   const {
     args
-  } = state$1;
+  } = state$2;
   const options = getOptions(args);
   if (options.executeItemCommand && _pick.command) {
     return {
@@ -3135,7 +3159,7 @@ const selectPick$8 = async (_pick, value) => {
     }
     executeCallback(resolveId, result);
   } else {
-    await invoke$1('QuickPick.executeCallback', resolveId, result);
+    await invoke$2('QuickPick.executeCallback', resolveId, result);
   }
   return {
     command: Hide
@@ -3160,12 +3184,12 @@ const selectPick$7 = async pick => {
 };
 
 const setCursor = async (rowIndex, columnIndex) => {
-  await invoke$1('Editor.cursorSet', rowIndex, columnIndex);
+  await invoke$2('Editor.cursorSet', rowIndex, columnIndex);
 };
 
 const goToPositionAndFocus = async (rowIndex, columnIndex) => {
   await setCursor(rowIndex, columnIndex);
-  await invoke$1('Editor.handleFocus');
+  await invoke$2('Editor.handleFocus');
 };
 
 const selectPickGoToColumn = async (item, value) => {
@@ -3210,14 +3234,14 @@ const selectPick$5 = async item => {
 const selectPick$4 = async pick => {
   const editorId = await getActiveEditorId();
   const value = pick.value;
-  await invoke$1('Viewlet.executeViewletCommand', editorId, 'setLanguageId', value.languageId, value.tokenizePath);
+  await invoke$2('Viewlet.executeViewletCommand', editorId, 'setLanguageId', value.languageId, value.tokenizePath);
   return {
     command: Hide
   };
 };
 
 const openWorkspaceFolder = uri => {
-  return invoke$1(/* Workspace.setPath */'Workspace.setPath', /* path */uri);
+  return invoke$2(/* Workspace.setPath */'Workspace.setPath', /* path */uri);
 };
 
 // TODO selectPick should be independent of show/hide
@@ -3459,7 +3483,7 @@ const handleBlur = async state => {
     const options = args.at(-1);
     if (!options?.executeItemCommand) {
       const resolveId = args[2];
-      await invoke$1('QuickPick.executeCallback', resolveId, getCancelResult(args));
+      await invoke$2('QuickPick.executeCallback', resolveId, getCancelResult(args));
     }
   }
   await closeWidget(state.uid);
@@ -3715,7 +3739,7 @@ const selectIndex = async (state, index, button = /* left */0) => {
     case Hide:
       await closeWidget(state.uid);
       if (selectPickResult.itemCommand) {
-        await invoke$1(selectPickResult.itemCommand, ...(selectPickResult.itemCommandArgs || []));
+        await invoke$2(selectPickResult.itemCommand, ...(selectPickResult.itemCommandArgs || []));
       }
       return state;
     case OpenColorTheme:
@@ -3772,6 +3796,31 @@ const handleMessagePort = async port => {
     isMessagePortOpen: true,
     messagePort: port
   });
+  set$1(rpc);
+};
+
+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 handleRendererProcessMessagePort = async port => {
+  const rpc = await create$8({
+    commandMap: {},
+    messagePort: port
+  });
   set(rpc);
 };
 
@@ -3810,13 +3859,6 @@ const renderHeight = (_oldState, 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(' ');
 };
@@ -4538,6 +4580,15 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
+const isFocusContextCommand = command => {
+  return Array.isArray(command) && command[0] === SetFocusContext;
+};
+const renderDirect = async (uid, commands) => {
+  const rendererWorkerCommands = commands.filter(isFocusContextCommand);
+  const rendererProcessCommands = commands.filter(command => !isFocusContextCommand(command));
+  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
+  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
+};
 const render2 = (uid, diffResult) => {
   const {
     newState,
@@ -4546,9 +4597,12 @@ const render2 = (uid, diffResult) => {
   if (oldState === newState) {
     return [];
   }
-  set$1(uid, newState, newState);
+  set$2(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
-  return commands;
+  if (!isConnected()) {
+    return commands;
+  }
+  return renderDirect(uid, commands);
 };
 
 const renderEventListeners = () => {
@@ -4620,7 +4674,7 @@ const showQuickInput = async ({
   const customItemsId = add(initialItems);
   const picks = [];
   try {
-    const result = await invoke$1('QuickPick.showCustom', picks, {
+    const result = await invoke$2('QuickPick.showCustom', picks, {
       customItemsId,
       ignoreFocusOut,
       initialValue,
@@ -4652,7 +4706,7 @@ const showQuickPick = async ({
     promise
   } = registerCallback();
   try {
-    await invoke$1('Viewlet.openWidget', QuickPick, 'custom', [], id, {
+    await invoke$2('Viewlet.openWidget', QuickPick, 'custom', [], id, {
       acceptInput,
       callbackOwner: 'quickPickWorker',
       customItemsId,
@@ -4688,6 +4742,7 @@ const commandMap = {
   'QuickPick.handleFocus': wrapCommand(handleFocus),
   'QuickPick.handleInput': wrapAsyncCommand(handleInputWithContext),
   'QuickPick.handleMessagePort': handleMessagePort,
+  'QuickPick.handleRendererProcessMessagePort': handleRendererProcessMessagePort,
   'QuickPick.handleScrollBarPointerDown': wrapCommand(handleScrollBarPointerDown),
   'QuickPick.handleScrollBarPointerMove': wrapCommand(handleScrollBarPointerMove),
   'QuickPick.handleScrollBarPointerUp': wrapCommand(handleScrollBarPointerUp),
@@ -4713,7 +4768,7 @@ const initializeEditorWorker = async () => {
       await sendMessagePortToEditorWorker(port, 0);
     }
   });
-  set$5(rpc);
+  set$7(rpc);
 };
 
 const initializeExtensionManagementWorker = async () => {
@@ -4723,7 +4778,7 @@ const initializeExtensionManagementWorker = async () => {
       await sendMessagePortToExtensionManagementWorker(port, 0);
     }
   });
-  set$4(rpc);
+  set$6(rpc);
 };
 
 const initializeFileSearchWorker = async () => {
@@ -4733,14 +4788,14 @@ const initializeFileSearchWorker = async () => {
       await sendMessagePortToFileSearchWorker2(port, 0);
     }
   });
-  set$3(rpc);
+  set$5(rpc);
 };
 
 const initializeRendererWorker = async () => {
   const rpc = await create$5({
     commandMap: commandMap
   });
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/quick-pick-worker",
-  "version": "4.13.2",
+  "version": "4.14.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/quick-pick-worker.git"