@lvce-editor/source-control-worker 1.6.0 → 1.8.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;
@@ -1103,37 +1103,62 @@ 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;
 };
@@ -1162,7 +1188,7 @@ const Directory = 3;
 const DirectoryExpanded = 4;
 const File = 7;
 
-const getFileIcon$1 = ({
+const getFileIcon = ({
   name
 }) => {
   return '';
@@ -1219,7 +1245,7 @@ const getDisplayItemsGroup = (group, isExpanded) => {
         detail: folderName,
         posInSet: i + 1,
         setSize: length,
-        icon: getFileIcon$1({
+        icon: getFileIcon({
           name: file
         }),
         decorationIcon: icon,
@@ -1243,35 +1269,31 @@ const getDisplayItems = (allGroups, isExpanded) => {
   return displayItems;
 };
 
+const getIconType = direntType => {
+  switch (direntType) {
+    case Directory:
+    case DirectoryExpanded:
+      return 2;
+    default:
+      return 1;
+  }
+};
 const getMissingIconRequests = (dirents, fileIconCache) => {
   const missingRequests = [];
   for (const dirent of dirents) {
     if (!(dirent.file in fileIconCache)) {
       missingRequests.push({
-        type: dirent.type,
-        name: dirent.label,
-        path: dirent.file
+        type: getIconType(dirent.type),
+        name: dirent.label
       });
     }
   }
   return missingRequests;
 };
 
-const getFileIcon = async name => {
-  return invoke$1('IconTheme.getFileIcon', {
-    name
-  });
-};
-
-const getFolderIcon = async name => {
-  return invoke$1('IconTheme.getFolderIcon', {
-    name
-  });
-};
-
 const requestFileIcons = async requests => {
-  const promises = requests.map(request => request.type === File ? getFileIcon(request.name) : getFolderIcon(request.name));
-  return Promise.all(promises);
+  const results = await invoke$1('IconTheme.getIcons', requests);
+  return results;
 };
 
 const updateIconCache = (iconCache, missingRequests, newIcons) => {
@@ -1284,7 +1306,7 @@ const updateIconCache = (iconCache, missingRequests, newIcons) => {
   for (let i = 0; i < missingRequests.length; i++) {
     const request = missingRequests[i];
     const icon = newIcons[i];
-    newFileIconCache[request.path] = icon;
+    newFileIconCache[request.name] = icon;
   }
   return newFileIconCache;
 };
@@ -1399,7 +1421,7 @@ const getVisibleSourceControlItems = (items, minLineY, maxLineY, actionsCache, f
     const item = items[i];
     const contextId = getContextId(item.groupId, item.type);
     const buttons = actionsCache[contextId] || emptySourceControlButtons;
-    const fileIcon = fileIconCache[item.file] || '';
+    const fileIcon = fileIconCache[item.label] || '';
     visible.push({
       ...item,
       buttons,
@@ -1454,7 +1476,7 @@ const loadContent = async state => {
   } = await getGroups(enabledProviderIds);
   const isExpanded = true;
   const displayItems = getDisplayItems(allGroups, isExpanded);
-  const cache = await requestSourceActions();
+  const actionsCache = await requestSourceActions();
   const splitButtonEnabled = get();
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
@@ -1463,9 +1485,8 @@ const loadContent = async state => {
   const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
   const minLineY = 0;
   const maxLineY = Math.min(numberOfVisible, total);
-  const slicedItems = displayItems.slice(minLineY, maxLineY);
-  const newFileIconCache = await getFileIcons(slicedItems, fileIconCache);
-  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, cache, newFileIconCache);
+  const newFileIconCache = await getFileIcons(displayItems, fileIconCache);
+  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
   const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
   return {
     ...state,
@@ -1480,7 +1501,8 @@ const loadContent = async state => {
     maxLineY,
     scrollBarHeight,
     finalDeltaY,
-    fileIconCache: newFileIconCache
+    fileIconCache: newFileIconCache,
+    actionsCache
   };
 };
 
@@ -1509,35 +1531,46 @@ const getIndex = (state, eventX, eventY) => {
   return index;
 };
 
-const handleClickDirectory = async (state, item) => {
+const updateVisibleItems = async (state, isExpanded) => {
   const {
-    allGroups
+    allGroups,
+    itemHeight,
+    height,
+    minimumSliderSize,
+    fileIconCache,
+    actionsCache
   } = state;
-  const isExpanded = true;
   const displayItems = getDisplayItems(allGroups, isExpanded);
   const newMaxLineY = displayItems.length;
+  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 slicedItems = displayItems.slice(minLineY, maxLineY);
+  const newFileIconCache = await getFileIcons(slicedItems, fileIconCache);
+  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
   return {
     ...state,
     items: displayItems,
     isExpanded,
-    maxLineY: newMaxLineY
+    maxLineY: newMaxLineY,
+    fileIconCache: newFileIconCache,
+    visibleItems,
+    scrollBarHeight
   };
 };
 
+const handleClickDirectory = async (state, item) => {
+  const isExpanded = true;
+  return updateVisibleItems(state, isExpanded);
+};
+
 const handleClickDirectoryExpanded = async (state, item) => {
-  const {
-    allGroups,
-    maxLineY
-  } = state;
   const isExpanded = false;
-  const displayItems = getDisplayItems(allGroups, isExpanded);
-  const newMaxLineY = Math.min(displayItems.length, maxLineY);
-  return {
-    ...state,
-    items: displayItems,
-    isExpanded,
-    maxLineY: newMaxLineY
-  };
+  return updateVisibleItems(state, isExpanded);
 };
 
 const readFile = async (uri, encoding = 'utf8') => {
@@ -1640,6 +1673,35 @@ const handleMouseOverAt = async (state, eventX, eventY) => {
   return handleMouseOver(state, index);
 };
 
+const setDeltaY = async (state, newDeltaY) => {
+  const {
+    itemHeight,
+    items,
+    height,
+    headerHeight,
+    actionsCache,
+    fileIconCache
+  } = state;
+  const normalizedDeltaY = Math.max(newDeltaY, 0);
+  const newMinLineY = Math.floor(normalizedDeltaY / itemHeight);
+  const total = items.length;
+  const listHeight = height - headerHeight;
+  const visibleCount = getNumberOfVisibleItems(listHeight, itemHeight);
+  const maxLineY = Math.min(newMinLineY + visibleCount, total);
+  const visible = getVisibleSourceControlItems(items, newMinLineY, maxLineY, actionsCache, fileIconCache);
+  return {
+    ...state,
+    deltaY: newDeltaY,
+    visibleItems: visible,
+    minLineY: newMinLineY,
+    maxLineY
+  };
+};
+
+const handleWheel = async (state, deltaMode, deltaY) => {
+  return setDeltaY(state, state.deltaY + deltaY);
+};
+
 const getPortTuple = () => {
   const {
     port1,
@@ -1651,8 +1713,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);
 };
 
@@ -1663,13 +1727,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`);
@@ -1678,7 +1739,7 @@ const createExtensionHostRpc = async () => {
 
 const initialize = async () => {
   const extensionHostRpc = await createExtensionHostRpc();
-  set(ExtensionHostWorker, extensionHostRpc);
+  set(extensionHostRpc);
 };
 
 const Actions = 'Actions';
@@ -2047,7 +2108,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;
 };
@@ -2179,6 +2240,8 @@ const commandMap = {
   'SourceControl.handleMouseOutAt': wrapCommand(handleMouseOutAt),
   'SourceControl.handleMouseOver': wrapCommand(handleMouseOver),
   'SourceControl.handleMouseOverAt': wrapCommand(handleMouseOverAt),
+  'SourceControl.setDeltaY': wrapCommand(setDeltaY),
+  'SourceControl.handleWheel': wrapCommand(handleWheel),
   'SourceControl.loadContent': wrapCommand(loadContent),
   'SourceControl.render2': render2,
   'SourceControl.renderActions2': renderActions,
@@ -2193,7 +2256,7 @@ 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.6.0",
+  "version": "1.8.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"