@lvce-editor/source-control-worker 1.7.0 → 1.9.0

package/dist/sourceControlWorkerMain.js

@@ -524,7 +524,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
+const set$5 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$3 = id => {
@@ -543,13 +543,13 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$2(id, resolve);
+  set$5(id, resolve);
   return {
     id,
     promise
   };
 };
-const create$2 = (method, params) => {
+const create$2$1 = (method, params) => {
   const {
     id,
     promise
@@ -841,7 +841,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const {
     message,
     promise
-  } = create$2(method, params);
+  } = create$2$1(method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -854,10 +854,10 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke$2 = (ipc, method, ...params) => {
+const invoke$3 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer$1 = (ipc, method, ...params) => {
+const invokeAndTransfer$2 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -887,10 +887,10 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$2(ipc, method, ...params);
+      return invoke$3(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$1(ipc, method, ...params);
+      return invokeAndTransfer$2(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -928,25 +928,25 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$8 = async ({
+const create$2 = async ({
   commandMap,
-  messagePort,
-  isMessagePortOpen
+  messagePort
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const rawIpc = await IpcParentWithMessagePort$1.create({
     messagePort,
-    isMessagePortOpen
+    isMessagePortOpen: true
   });
   const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
   handleIpc(ipc);
   const rpc = createRpc(ipc);
+  messagePort.start();
   return rpc;
 };
-const MessagePortRpcParent = {
+const PlainMessagePortRpcParent = {
   __proto__: null,
-  create: create$8
+  create: create$2
 };
 const create$1 = async ({
   commandMap
@@ -1024,7 +1024,7 @@ const create = () => {
 
 const {
   get: get$2,
-  set: set$1,
+  set: set$4,
   wrapCommand
 } = create();
 
@@ -1064,7 +1064,7 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     x,
     y
   };
-  set$1(id, state, state);
+  set$4(id, state, state);
 };
 
 const RenderItems = 4;
@@ -1097,43 +1097,68 @@ const diff2 = uid => {
   return result;
 };
 
-const commandIds = ['acceptInput', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'handleClick', 'handleClickAt', 'handleFocus', 'handleIconThemeChange', 'handleMouseOut', 'handleMouseOutAt', 'handleMouseOver', 'handleMouseOverAt', 'handleWheel', 'selectIndex'];
+const commandIds = ['acceptInput', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'refresh', 'handleClickSourceControlButtons', 'handleClick', 'handleClickAt', 'handleFocus', 'handleIconThemeChange', 'handleMouseOut', 'handleMouseOutAt', 'handleMouseOver', 'handleMouseOverAt', 'handleWheel', 'selectIndex'];
 
 const getCommandIds = () => {
   return commandIds;
 };
 
-const RendererWorker = 1;
-const ExtensionHostWorker = 44;
-const DebugWorker = 55;
-
 const rpcs = Object.create(null);
-const set = (id, rpc) => {
+const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
   return rpcs[id];
 };
-
-const invoke$1 = (method, ...params) => {
-  const rpc = get$1(RendererWorker);
+const RendererWorker$1 = 1;
+const ExtensionHostWorker = 44;
+const invoke$1$1 = (method, ...params) => {
+  const rpc = get$1(RendererWorker$1);
   // @ts-ignore
   return rpc.invoke(method, ...params);
 };
-const invokeAndTransfer = (method, ...params) => {
-  const rpc = get$1(RendererWorker);
+const invokeAndTransfer$1 = (method, ...params) => {
+  const rpc = get$1(RendererWorker$1);
   // @ts-ignore
   return rpc.invokeAndTransfer(method, ...params);
 };
+const set$1$1 = rpc => {
+  set$2(RendererWorker$1, rpc);
+};
+const RendererWorker = {
+  __proto__: null,
+  invoke: invoke$1$1,
+  invokeAndTransfer: invokeAndTransfer$1,
+  set: set$1$1
+};
+const invoke$2 = (method, ...params) => {
+  const rpc = get$1(ExtensionHostWorker);
+  // @ts-ignore
+  return rpc.invoke(method, ...params);
+};
+const set$3 = rpc => {
+  set$2(ExtensionHostWorker, rpc);
+};
+const ExtensionHost = {
+  __proto__: null,
+  invoke: invoke$2,
+  set: set$3
+};
+
+const {
+  invoke: invoke$1,
+  invokeAndTransfer,
+  set: set$1
+} = RendererWorker;
 
 const activateByEvent = event => {
   return invoke$1('ExtensionHostManagement.activateByEvent', event);
 };
 
-const invoke = async (method, ...params) => {
-  const rpc = get$1(ExtensionHostWorker);
-  return rpc.invoke(method, ...params);
-};
+const {
+  invoke,
+  set
+} = ExtensionHost;
 
 const executeProvider = async ({
   event,
@@ -1141,6 +1166,7 @@ const executeProvider = async ({
   params
 }) => {
   await activateByEvent(event);
+  // @ts-ignore
   const result = await invoke(method, ...params);
   return result;
 };
@@ -1505,6 +1531,65 @@ const getIndex = (state, eventX, eventY) => {
   return index;
 };
 
+const refresh = async state => {
+  const {
+    itemHeight,
+    height,
+    minimumSliderSize,
+    fileIconCache,
+    enabledProviderIds,
+    splitButtonEnabled,
+    actionsCache
+  } = state;
+  const {
+    allGroups,
+    gitRoot
+  } = await getGroups(enabledProviderIds);
+  const isExpanded = true;
+  const displayItems = getDisplayItems(allGroups, isExpanded);
+  const total = displayItems.length;
+  const contentHeight = total * itemHeight;
+  const listHeight = getListHeight(total, itemHeight, height);
+  const scrollBarHeight = getScrollBarSize(height, contentHeight, minimumSliderSize);
+  const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
+  const minLineY = 0;
+  const maxLineY = Math.min(numberOfVisible, total);
+  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, fileIconCache);
+  const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
+  return {
+    ...state,
+    allGroups,
+    gitRoot,
+    items: displayItems,
+    visibleItems,
+    enabledProviderIds,
+    isExpanded,
+    splitButtonEnabled,
+    maxLineY,
+    scrollBarHeight,
+    finalDeltaY,
+    actionsCache
+  };
+};
+
+const handleClickSourceControlButtons = async (state, index, name) => {
+  const {
+    visibleItems
+  } = state;
+  const item = visibleItems[index];
+  if (!item) {
+    return state;
+  }
+  const button = item.buttons.find(button => button.label === name);
+  if (!button) {
+    return state;
+  }
+  const file = item.file;
+  await executeCommand(button.command, file);
+  const newState = await refresh(state);
+  return newState;
+};
+
 const updateVisibleItems = async (state, isExpanded) => {
   const {
     allGroups,
@@ -1592,8 +1677,11 @@ const selectIndex = async (state, index) => {
   }
 };
 
-const handleClickAt = async (state, eventX, eventY) => {
+const handleClickAt = async (state, eventX, eventY, name) => {
   const index = getIndex(state, eventX, eventY);
+  if (name) {
+    return handleClickSourceControlButtons(state, index, name);
+  }
   return selectIndex(state, index);
 };
 
@@ -1687,8 +1775,10 @@ const getPortTuple = () => {
   };
 };
 
+const DebugWorker = 55;
+
 const sendMessagePortToExtensionHostWorker = async port => {
-  const command = 'HandleMessagePort.handleMessagePort';
+  const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, DebugWorker);
 };
 
@@ -1699,13 +1789,10 @@ const createExtensionHostRpc = async () => {
       port2
     } = getPortTuple();
     await sendMessagePortToExtensionHostWorker(port2);
-    port1.start();
-    const rpc = await MessagePortRpcParent.create({
+    const rpc = await PlainMessagePortRpcParent.create({
       commandMap: {},
-      messagePort: port1,
-      isMessagePortOpen: false
+      messagePort: port1
     });
-    // TODO createMessageportRpcParent should call port start
     return rpc;
   } catch (error) {
     throw new VError(error, `Failed to create extension host rpc`);
@@ -1714,10 +1801,11 @@ const createExtensionHostRpc = async () => {
 
 const initialize = async () => {
   const extensionHostRpc = await createExtensionHostRpc();
-  set(ExtensionHostWorker, extensionHostRpc);
+  set(extensionHostRpc);
 };
 
 const Actions = 'Actions';
+const SourceControlButtons = 'SourceControlButtons';
 const Grow = 'Grow';
 const Chevron = 'Chevron';
 const ChevronRight = 'ChevronRight';
@@ -1849,7 +1937,8 @@ const getButtonVirtualDom = button => {
     className: SourceControlButton,
     title: label,
     ariaLabel: label,
-    childCount: 1
+    childCount: 1,
+    name: label
   }, getIconVirtualDom(icon, Span)];
 };
 
@@ -1859,7 +1948,7 @@ const getButtonsVirtualDom = buttons => {
   }
   return [{
     type: Div,
-    className: 'SourceControlButtons',
+    className: SourceControlButtons,
     childCount: buttons.length
   }, ...buttons.flatMap(getButtonVirtualDom)];
 };
@@ -2083,7 +2172,7 @@ const render2 = (uid, diffResult) => {
     oldState,
     newState
   } = get$2(uid);
-  set$1(uid, newState, newState);
+  set$4(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2139,7 +2228,7 @@ const renderEventListeners = () => {
     params: ['handleFocus']
   }, {
     name: HandleClickAt,
-    params: ['handleClickAt', 'event.clientX', 'event.clientY']
+    params: ['handleClickAt', 'event.clientX', 'event.clientY', 'event.target.name']
   }, {
     name: HandleMouseOverAt,
     params: ['handleMouseOverAt', 'event.clientX', 'event.clientY']
@@ -2212,6 +2301,7 @@ const commandMap = {
   'SourceControl.handleContextMenu': wrapCommand(handleContextMenu),
   'SourceControl.handleFocus': wrapCommand(handleFocus),
   'SourceControl.handleMouseOut': wrapCommand(handleMouseOut),
+  'SourceControl.refresh': wrapCommand(refresh),
   'SourceControl.handleMouseOutAt': wrapCommand(handleMouseOutAt),
   'SourceControl.handleMouseOver': wrapCommand(handleMouseOver),
   'SourceControl.handleMouseOverAt': wrapCommand(handleMouseOverAt),
@@ -2224,14 +2314,15 @@ const commandMap = {
   'SourceControl.saveState': saveState,
   'SourceControl.selectIndex': wrapCommand(selectIndex),
   'SourceControl.terminate': terminate,
-  'SourceControl.updateIcons': wrapCommand(updateIcons)
+  'SourceControl.updateIcons': wrapCommand(updateIcons),
+  'SourceControl.handleClickSourceControlButtons': wrapCommand(handleClickSourceControlButtons)
 };
 
 const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set(RendererWorker, rpc);
+  set$1(rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/source-control-worker",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"