@lvce-editor/extension-search-view 7.16.0 → 7.17.0

package/dist/extensionSearchViewWorkerMain.js

@@ -1123,7 +1123,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$4 = (id, rpc) => {
+const set$6 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1156,7 +1156,7 @@ const create$3 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$4(rpcId, mockRpc);
+      set$6(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1165,7 +1165,7 @@ const create$3 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$4(rpcId, rpc);
+      set$6(rpcId, rpc);
     }
   };
 };
@@ -1359,70 +1359,77 @@ const LeftClick = 0;
 
 const DialogWorker = 7014;
 const ExtensionManagementWorker = 9006;
+const RendererProcess = 1670;
 const RendererWorker = 1;
 
 const FocusSelector = 'Viewlet.focusSelector';
 const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
 const SetPatches = 'Viewlet.setPatches';
 
 const {
-  invoke: invoke$2,
-  set: set$3
+  invoke: invoke$4,
+  set: set$5
 } = create$3(DialogWorker);
 
 const {
-  invoke: invoke$1,
-  set: set$2
+  invoke: invoke$3,
+  set: set$4
 } = create$3(ExtensionManagementWorker);
 const disableWorkspace$2 = id => {
-  return invoke$1('Extensions.disableWorkspace', id);
+  return invoke$3('Extensions.disableWorkspace', id);
 };
 const uninstall$2 = id => {
-  return invoke$1(`Extensions.uninstall`, id);
+  return invoke$3(`Extensions.uninstall`, id);
 };
 
 const {
-  invoke,
+  invoke: invoke$2,
+  set: set$3
+} = create$3(RendererProcess);
+
+const {
+  invoke: invoke$1,
   invokeAndTransfer,
-  set: set$1
+  set: set$2
 } = create$3(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$1('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToDialogWorker = async port => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
 };
 const disableExtension = async id => {
-  return invoke('ExtensionManagement.disable', id);
+  return invoke$1('ExtensionManagement.disable', id);
 };
 const enableExtension = async id => {
-  return invoke('ExtensionManagement.enable', id);
+  return invoke$1('ExtensionManagement.enable', id);
 };
 const writeClipBoardText = async text => {
-  await invoke('ClipBoard.writeText', /* text */text);
+  await invoke$1('ClipBoard.writeText', /* text */text);
 };
 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('Main.openUri', {
+  await invoke$1('Main.openUri', {
     ...options,
     focus,
     uri
   });
 };
 const showErrorDialog = async errorInfo => {
-  await invoke('ErrorHandling.showErrorDialog', errorInfo);
+  await invoke$1('ErrorHandling.showErrorDialog', errorInfo);
 };
 const installExtension = async id => {
-  return invoke('ExtensionManagement.install', id);
+  return invoke$1('ExtensionManagement.install', id);
 };
 
 const toCommandId = key => {
@@ -2099,6 +2106,20 @@ const parseValue = value => {
   };
 };
 
+const Disabled$1 = 'disabled';
+const Enabled = 'enabled';
+const Installing = 'installing';
+const NotInstalled = 'not-installed';
+const Uninstalling = 'uninstalling';
+const statuses = [Disabled$1, Enabled, Installing, NotInstalled, Uninstalling];
+const isExtensionStatus = status => {
+  return statuses.includes(status);
+};
+
+const isExtensionDisabled = (disabled, status) => {
+  return status === Disabled$1 || status !== Enabled && disabled;
+};
+
 const matchesName = (extension, query) => {
   const extensionNameLower = extension.name.toLowerCase();
   return extensionNameLower.includes(query);
@@ -2113,6 +2134,10 @@ const matchesCategory = (extension, category) => {
   });
 };
 const matchesParsedValue = (extension, parsedValue) => {
+  const extensionIsDisabled = isExtensionDisabled(extension.disabled === true, extension.status);
+  if (parsedValue.disabled && !extensionIsDisabled || parsedValue.enabled && extensionIsDisabled) {
+    return false;
+  }
   if (parsedValue.id && extension.id) {
     return parsedValue.id === extension.id;
   }
@@ -2449,7 +2474,7 @@ const {
   get,
   getCommandIds,
   registerCommands,
-  set,
+  set: set$1,
   wrapAsyncCommand,
   wrapCommand,
   wrapGetter
@@ -2496,7 +2521,7 @@ const create = (id, uri, x, y, width, height, platform, assetDir, parentUid) =>
     y
   };
   create$1(id);
-  set(id, state, state);
+  set$1(id, state, state);
 };
 
 const isEqual$4 = (oldState, newState) => {
@@ -2540,16 +2565,6 @@ const diff2 = uid => {
   return diff(uid, modules, numbers);
 };
 
-const Disabled$1 = 'disabled';
-const Enabled = 'enabled';
-const Installing = 'installing';
-const NotInstalled = 'not-installed';
-const Uninstalling = 'uninstalling';
-const statuses = [Disabled$1, Enabled, Installing, NotInstalled, Uninstalling];
-const isExtensionStatus = status => {
-  return statuses.includes(status);
-};
-
 const updateStatus = (extension, id, status, builtin) => {
   if (extension.id !== id) {
     return extension;
@@ -2611,7 +2626,7 @@ const enableWorkspace = async state => {
   if (!item) {
     return state;
   }
-  await invoke$1('Extensions.enableWorkspace', item.id);
+  await invoke$3('Extensions.enableWorkspace', item.id);
   return setExtensionStatus(state, item.id, Enabled);
 };
 
@@ -3554,7 +3569,7 @@ const Remote = 3;
 
 const getAllExtensions$1 = async (assetDir, platform) => {
   try {
-    return await invoke$1('Extensions.getAllExtensions', assetDir, platform);
+    return await invoke$3('Extensions.getAllExtensions', assetDir, platform);
   } catch (error) {
     if (platform === Web) {
       return [];
@@ -3795,6 +3810,31 @@ const handleInstall = async (state, id) => {
   return setExtensionStatus(state, id, Enabled);
 };
 
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
+};
+const set = rpc => {
+  set$3(rpc);
+  state.connected = true;
+};
+
+const handleMessagePort = async port => {
+  const rpc = await create$7({
+    commandMap: {},
+    messagePort: port
+  });
+  set(rpc);
+};
+
 const handleScrollBarCaptureLost = state => {
   return {
     ...state,
@@ -3987,7 +4027,7 @@ const createExtensionManagementWorkerRpc = async () => {
 const initializeExtensionManagementWorker = async () => {
   try {
     const rpc = await createExtensionManagementWorkerRpc();
-    set$2(rpc);
+    set$4(rpc);
   } catch {
     // ignore
   }
@@ -3998,7 +4038,7 @@ const initialize = async () => {
 };
 
 const installAnotherVersion = async state => {
-  await invoke$2('ConfirmPrompt.prompt', 'not implemented', undefined);
+  await invoke$4('ConfirmPrompt.prompt', 'not implemented', undefined);
   return state;
 };
 
@@ -4525,7 +4565,7 @@ const getExtensionActions = (builtin, disabled, status) => {
   if (status === Uninstalling) {
     return builtin ? [] : [uninstalling];
   }
-  const enableOrDisable = status === Disabled$1 || status === undefined && disabled ? enable : disable;
+  const enableOrDisable = isExtensionDisabled(disabled, status) ? enable : disable;
   return builtin ? [enableOrDisable] : [enableOrDisable, uninstall];
 };
 
@@ -4949,14 +4989,20 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
-const render3 = (uid, diffResult) => {
+const render3 = async (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;
+  }
+  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 getIconVirtualDom = (icon, type = Div) => {
@@ -5217,6 +5263,7 @@ const commandMap = {
   'SearchExtensions.handleInput': wrapAsyncCommand(handleInputWithContext),
   'SearchExtensions.handleInputFocus': wrapCommand(handleInputFocus),
   'SearchExtensions.handleInstall': wrapCommand(handleInstall),
+  'SearchExtensions.handleMessagePort': handleMessagePort,
   'SearchExtensions.handleScrollBarCaptureLost': wrapCommand(handleScrollBarCaptureLost),
   'SearchExtensions.handleScrollBarClick': wrapCommand(handleScrollBarClick),
   'SearchExtensions.handleScrollBarMove': wrapCommand(handleScrollBarMove),
@@ -5250,12 +5297,12 @@ const listen = async () => {
   const rpc = await create$4({
     commandMap: commandMap
   });
-  set$1(rpc);
+  set$2(rpc);
   const dialogRpc = await create$5({
     commandMap: {},
     send: sendMessagePortToDialogWorker
   });
-  set$3(dialogRpc);
+  set$5(dialogRpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-search-view",
-  "version": "7.16.0",
+  "version": "7.17.0",
   "description": "Extension Search View Worker",
   "repository": {
     "type": "git",