@lvce-editor/source-control-worker 2.19.0 → 2.23.0

package/dist/sourceControlWorkerMain.js

@@ -231,8 +231,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -255,14 +255,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -281,8 +281,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -292,8 +292,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -354,8 +354,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -375,8 +375,8 @@ const listen$6 = async () => {
   const type = firstMessage.params[0];
   if (type === 'message-port') {
     parentIpc.send({
-      jsonrpc: '2.0',
       id: firstMessage.id,
+      jsonrpc: '2.0',
       result: null
     });
     parentIpc.dispose();
@@ -433,8 +433,8 @@ const removeListener = (emitter, type, callback) => {
 };
 const getFirstEvent = (eventEmitter, eventMap) => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   const listenerMap = Object.create(null);
   const cleanup = value => {
@@ -446,8 +446,8 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   for (const [event, type] of Object.entries(eventMap)) {
     const listener = event => {
       cleanup({
-        type,
-        event
+        event,
+        type
       });
     };
     addListener(eventEmitter, event, listener);
@@ -457,8 +457,8 @@ const getFirstEvent = (eventEmitter, eventMap) => {
 };
 const Message$1 = 3;
 const create$5$1 = async ({
-  messagePort,
-  isMessagePortOpen
+  isMessagePortOpen,
+  messagePort
 }) => {
   if (!isMessagePort(messagePort)) {
     throw new IpcError('port must be of type MessagePort');
@@ -471,8 +471,8 @@ const create$5$1 = async ({
   });
   messagePort.start();
   const {
-    type,
-    event
+    event,
+    type
   } = await eventPromise;
   if (type !== Message$1) {
     throw new IpcError('Failed to wait for ipc message');
@@ -1018,26 +1018,11 @@ const WebWorkerRpcClient = {
   create: create$2
 };
 
-const None$1 = 'none';
-const ToolBar = 'toolbar';
-const Tree$1 = 'tree';
-const TreeItem$1 = 'treeitem';
-
-const Badge = 'Badge';
-const SourceControlBadge = 'SourceControlBadge';
-
 const Directory = 3;
 const DirectoryExpanded = 4;
 const File = 7;
 
-const Button$2 = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const TextArea = 62;
-
-const Button$1 = 'event.button';
+const Button$2 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const DeltaMode = 'event.deltaMode';
@@ -1045,21 +1030,17 @@ const DeltaY = 'event.deltaY';
 const TargetName = 'event.target.name';
 const TargetValue = 'event.target.value';
 
-const Enter = 3;
-
 const User = 1;
 const Script = 2;
 
-const CtrlCmd = 1 << 11 >>> 0;
-
 const SourceControl$1 = 22;
 
-const None = 0;
+const None$1 = 0;
 
 const ExtensionHostWorker = 44;
+const IconThemeWorker = 7009;
 const RendererWorker = 1;
 const SourceControlWorker = 66;
-const IconThemeWorker = 7009;
 
 const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
@@ -1067,7 +1048,7 @@ const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 
 const List = 1;
-const Tree = 2;
+const Tree$1 = 2;
 
 const FocusSourceControlInput = 24;
 
@@ -1081,6 +1062,10 @@ const get$2 = id => {
 
 const create$1 = rpcId => {
   return {
+    async dispose() {
+      const rpc = get$2(rpcId);
+      await rpc.dispose();
+    },
     // @ts-ignore
     invoke(method, ...params) {
       const rpc = get$2(rpcId);
@@ -1095,22 +1080,20 @@ const create$1 = rpcId => {
     },
     set(rpc) {
       set$4(rpcId, rpc);
-    },
-    async dispose() {
-      const rpc = get$2(rpcId);
-      await rpc.dispose();
     }
   };
 };
 
 const {
   invoke: invoke$1,
-  set: set$3} = create$1(ExtensionHostWorker);
+  set: set$3
+} = create$1(ExtensionHostWorker);
 
 const {
   invoke,
   invokeAndTransfer,
-  set: set$2} = create$1(RendererWorker);
+  set: set$2
+} = create$1(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -1126,8 +1109,8 @@ const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
 };
-const activateByEvent$1 = event => {
-  return invoke('ExtensionHostManagement.activateByEvent', event);
+const activateByEvent$1 = (event, assetDir, platform) => {
+  return invoke('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
 };
 const sendMessagePortToTextMeasurementWorker$1 = async port => {
   const command = 'TextMeasurement.handleMessagePort';
@@ -1142,7 +1125,8 @@ const openUri$1 = async (uri, focus, options) => {
 };
 
 const {
-  set: set$1} = create$1(IconThemeWorker);
+  set: set$1
+} = create$1(IconThemeWorker);
 
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
@@ -1381,16 +1365,21 @@ const getFinalDeltaY = (height, itemHeight, itemsLength) => {
   return finalDeltaY;
 };
 
-const activateByEvent = event => {
-  return activateByEvent$1(event);
+const activateByEvent = (event, assetDir, platform) => {
+  string(event);
+  string(assetDir);
+  number(platform);
+  return activateByEvent$1(event, assetDir, platform);
 };
 
 const executeProvider = async ({
+  assetDir,
   event,
   method,
-  params
+  params,
+  platform
 }) => {
-  await activateByEvent(event);
+  await activateByEvent(event, assetDir, platform);
   // @ts-ignore
   const result = await invoke$1(method, ...params);
   return result;
@@ -1403,42 +1392,54 @@ const SourceControlGetEnabledProviderIds = 'ExtensionHostSourceControl.getEnable
 const SourceControlGetFileBefore = 'ExtensionHostSourceControl.getFileBefore';
 const SourceControlGetGroups = 'ExtensionHostSourceControl.getGroups';
 
-const acceptInput$2 = async (providerId, text) => {
+const acceptInput$2 = async (providerId, text, assetDir, platform) => {
   return executeProvider({
+    assetDir,
     event: 'none',
     method: SourceControlAcceptInput,
-    params: [providerId, text]
+    params: [providerId, text],
+    platform
     // noProviderFoundMessage: 'No source control provider found',
   });
 };
-const getFileDecorations$1 = (providerId, uris) => {
+const getFileDecorations$1 = (providerId, uris, assetDir, platform) => {
+  string(assetDir);
+  number(platform);
   return executeProvider({
+    assetDir,
     event: 'none',
     method: SourceControlGetFileDecorations,
-    params: [providerId, uris]
+    params: [providerId, uris],
+    platform
   });
 };
-const getFileBefore$1 = (providerId, path) => {
+const getFileBefore$1 = (providerId, path, assetDir, platform) => {
   return executeProvider({
+    assetDir,
     event: 'none',
     method: SourceControlGetFileBefore,
-    params: [providerId, path]
+    params: [providerId, path],
+    platform
     // noProviderFoundMessage: 'No source control provider found',
   });
 };
-const getGroups$2 = (providerId, path) => {
+const getGroups$2 = (providerId, path, assetDir, platform) => {
   return executeProvider({
+    assetDir,
     event: 'none',
     method: SourceControlGetGroups,
-    params: [providerId, path]
+    params: [providerId, path],
+    platform
     // noProviderFoundMessage: 'No source control provider found',
   });
 };
-const getEnabledProviderIds$1 = (scheme, root) => {
+const getEnabledProviderIds$1 = (scheme, root, assetDir, platform) => {
   return executeProvider({
+    assetDir,
     event: `onSourceControl:${scheme}`,
     method: SourceControlGetEnabledProviderIds,
-    params: [scheme, root]
+    params: [scheme, root],
+    platform
     // noProviderFoundMessage: 'No source control provider found',
   });
 };
@@ -1448,24 +1449,24 @@ const getIconDefinitions$1 = async providerId => {
   return result;
 };
 
-const acceptInput$1 = (providerId, text) => {
+const acceptInput$1 = (providerId, text, assetDir, platform) => {
   string(providerId);
   string(text);
-  return acceptInput$2(providerId, text);
+  return acceptInput$2(providerId, text, assetDir, platform);
 };
-const getFileDecorations = (providerId, uris) => {
-  return getFileDecorations$1(providerId, uris);
+const getFileDecorations = (providerId, uris, assetDir, platform) => {
+  return getFileDecorations$1(providerId, uris, assetDir, platform);
 };
-const getFileBefore = (providerId, file) => {
-  return getFileBefore$1(providerId, file);
+const getFileBefore = (providerId, file, assetDir, platform) => {
+  return getFileBefore$1(providerId, file, assetDir, platform);
 };
-const getEnabledProviderIds = (scheme, root) => {
+const getEnabledProviderIds = (scheme, root, assetDir, platform) => {
   string(scheme);
   string(root);
-  return getEnabledProviderIds$1(scheme, root);
+  return getEnabledProviderIds$1(scheme, root, assetDir, platform);
 };
-const getGroups$1 = (providerId, root) => {
-  return getGroups$2(providerId, root);
+const getGroups$1 = (providerId, root, assetDir, platform) => {
+  return getGroups$2(providerId, root, assetDir, platform);
 };
 const getIconDefinitions = async providerIds => {
   try {
@@ -1478,11 +1479,10 @@ const getIconDefinitions = async providerIds => {
   }
 };
 
-const getGroups = async enabledProviderIds => {
+const getGroups = async (enabledProviderIds, root, assetDir, platform) => {
   const allGroups = [];
   for (const providerId of enabledProviderIds) {
-    // @ts-ignore
-    const groups = await getGroups$1(providerId);
+    const groups = await getGroups$1(providerId, root, assetDir, platform);
     allGroups.push(...groups);
   }
   return {
@@ -1491,28 +1491,28 @@ const getGroups = async enabledProviderIds => {
   };
 };
 
-const getTextHeight = async (input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight) => {
+const getTextHeight = async (input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight, inputPadding) => {
   try {
     if (!input) {
-      return lineHeight;
+      return lineHeight + inputPadding * 2;
     }
     const actualInput = input;
     // TODO line height could also be like 1.5
     const lineHeightPx = `${lineHeight}px`;
     // @ts-ignore
     const height = await invoke(`MeasureTextHeight.measureTextBlockHeight`, actualInput, fontFamily, fontSize, lineHeightPx, width);
-    return height;
+    return height + inputPadding * 2;
   } catch {
     // fallback
     const lines = input.split('\n');
     const lineCount = lines.length;
-    const inputHeight = lineCount * lineHeight;
+    const inputHeight = lineCount * lineHeight + inputPadding * 2;
     return inputHeight;
   }
 };
 
-const getInputHeight = async (input, width, fontFamily, fontWeight, fontSize, letterSpacing, lineHeight) => {
-  const height = await getTextHeight(input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight);
+const getInputHeight = async (input, width, fontFamily, fontWeight, fontSize, letterSpacing, lineHeight, inputPadding) => {
+  const height = await getTextHeight(input, width, fontFamily, fontSize, fontWeight, letterSpacing, lineHeight, inputPadding);
   return height;
 };
 
@@ -1710,6 +1710,7 @@ const loadContent = async (state, savedState) => {
     inputFontWeight,
     inputLetterSpacing,
     inputLineHeight,
+    inputPadding,
     itemHeight,
     minimumSliderSize,
     width,
@@ -1720,12 +1721,16 @@ const loadContent = async (state, savedState) => {
   const {
     inputValue
   } = restoreState(savedState);
-  const enabledProviderIds = await getEnabledProviderIds(scheme, root);
+  const {
+    assetDir,
+    platform
+  } = state;
+  const enabledProviderIds = await getEnabledProviderIds(scheme, root, assetDir, platform);
   const iconDefinitions = await getIconDefinitions(enabledProviderIds);
   const {
     allGroups,
     gitRoot
-  } = await getGroups(enabledProviderIds);
+  } = await getGroups(enabledProviderIds, root, assetDir, platform);
   const expandedGroups = restoreExpandedGroups(allGroups);
   const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
   const actionsCache = await requestSourceActions();
@@ -1744,7 +1749,7 @@ const loadContent = async (state, savedState) => {
   const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
   const finalDeltaY = getFinalDeltaY(listHeight, itemHeight, total);
   const inputPlaceholder = messageEnterToCommitOnMaster();
-  const inputBoxHeight = await getInputHeight(inputValue, width, inputFontFamily, inputFontSize, inputFontWeight, inputLetterSpacing, inputLineHeight);
+  const inputBoxHeight = await getInputHeight(inputValue, width, inputFontFamily, inputFontSize, inputFontWeight, inputLetterSpacing, inputLineHeight, inputPadding);
   return {
     ...state,
     actionsCache,
@@ -1780,15 +1785,17 @@ const warn = (...args) => {
 
 const acceptInput = async state => {
   const {
+    assetDir,
     enabledProviderIds,
-    inputValue
+    inputValue,
+    platform
   } = state;
   if (enabledProviderIds.length === 0) {
     info('[ViewletSourceControl] no source control provider found');
     return state;
   }
   const providerId = enabledProviderIds[0];
-  await acceptInput$1(providerId, inputValue);
+  await acceptInput$1(providerId, inputValue, assetDir, platform);
   const newState = await loadContent(state, {});
   return {
     ...newState,
@@ -1805,10 +1812,11 @@ const {
   wrapGetter
 } = create();
 
-const create2 = (id, uri, x, y, width, height, workspacePath) => {
+const create2 = (id, uri, x, y, width, height, workspacePath, platform, assetDir) => {
   const state = {
     actionsCache: Object.create(null),
     allGroups: [],
+    assetDir,
     badgeCount: 0,
     decorationIcons: [],
     deltaY: 0,
@@ -1833,6 +1841,7 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     inputFontWeight: 400,
     inputLetterSpacing: 0,
     inputLineHeight: 20,
+    inputPadding: 2,
     inputPlaceholder: '',
     inputSource: 0,
     inputValue: '',
@@ -1844,6 +1853,7 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     merge: [],
     minimumSliderSize: 20,
     minLineY: 0,
+    platform,
     providerId: '',
     root: '',
     scrollBarActive: false,
@@ -1918,6 +1928,25 @@ const getInfo = uid => {
   return newState.allGroups;
 };
 
+const None = 'none';
+const ToolBar = 'toolbar';
+const Tree = 'tree';
+const TreeItem$1 = 'treeitem';
+
+const Badge = 'Badge';
+const SourceControlBadge = 'SourceControlBadge';
+
+const Button$1 = 1;
+const Div = 4;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const TextArea = 62;
+
+const Enter = 3;
+
+const CtrlCmd = 1 << 11 >>> 0;
+
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -1941,42 +1970,42 @@ const getKeyBindings = () => {
 const getMenuEntries = () => {
   return [{
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: '',
     label: openChanges()
   }, {
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: '',
     label: openFile()
   }, {
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: '',
     label: openFileHead()
   }, {
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: '',
     label: discardChanges()
   }, {
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: '',
     label: stageChanges()
   }, {
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: '',
     label: addToGitignore()
   }, {
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: '',
     label: revealInExplorerView()
   }, {
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: '',
     label: openContainingFolder()
   }];
@@ -1998,18 +2027,21 @@ const Refresh$1 = 'Refresh';
 const refresh = async state => {
   const {
     actionsCache,
+    assetDir,
     enabledProviderIds,
     fileIconCache,
     height,
     iconDefinitions,
     itemHeight,
     minimumSliderSize,
+    platform,
+    root,
     splitButtonEnabled
   } = state;
   const {
     allGroups,
     gitRoot
-  } = await getGroups(enabledProviderIds);
+  } = await getGroups(enabledProviderIds, root, assetDir, platform);
   const expandedGroups = restoreExpandedGroups(allGroups);
   const displayItems = getDisplayItems(allGroups, expandedGroups, iconDefinitions);
   const badgeCount = allGroups.reduce((sum, group) => sum + group.items.length, 0);
@@ -2043,7 +2075,7 @@ const refresh = async state => {
 const viewAsTree = state => {
   return {
     ...state,
-    viewMode: Tree
+    viewMode: Tree$1
   };
 };
 
@@ -2062,11 +2094,13 @@ const handleActionClick = async (state, actionName) => {
   }
 };
 
-const executeCommand = (id, ...args) => {
+const executeCommand = (id, assetDir, platform, ...args) => {
   return executeProvider({
+    assetDir,
     event: `onCommand:${id}`,
     method: CommandExecute,
-    params: [id, ...args]
+    params: [id, ...args],
+    platform
   });
 };
 
@@ -2079,7 +2113,7 @@ const handleButtonClick = async (state, clickedIndex) => {
   if (!button) {
     return state;
   }
-  await executeCommand(button.command, item.file);
+  await executeCommand(button.command, state.assetDir, state.platform, item.file);
   const newState = await loadContent(state, {});
   return newState;
 };
@@ -2114,7 +2148,7 @@ const handleClickSourceControlButtons = async (state, index, name) => {
   const {
     file
   } = item;
-  await executeCommand(button.command, file);
+  await executeCommand(button.command, state.assetDir, state.platform, file);
   const newState = await refresh(state);
   return newState;
 };
@@ -2188,13 +2222,15 @@ const openDiffEditor = async (before, afterPath, width) => {
 
 const handleClickFile = async (state, item) => {
   const {
+    assetDir,
     enabledProviderIds,
+    platform,
     root
   } = state;
   const providerId = enabledProviderIds[0];
   const absolutePath = `${root}/${item.file}`;
   // TODO handle error
-  const [fileBefore] = await Promise.all([getFileBefore(providerId, item.file), readFile(absolutePath)]);
+  const [fileBefore] = await Promise.all([getFileBefore(providerId, item.file, assetDir, platform), readFile(absolutePath)]);
 
   // TODO diff editor should determine width by itself
   await openDiffEditor(fileBefore, absolutePath);
@@ -2259,9 +2295,10 @@ const handleInput = async (state, value, inputSource = User) => {
     inputFontWeight,
     inputLetterSpacing,
     inputLineHeight,
+    inputPadding,
     width
   } = state;
-  const inputBoxHeight = await getInputHeight(value, width, inputFontFamily, inputFontWeight, inputFontSize, inputLetterSpacing, inputLineHeight);
+  const inputBoxHeight = await getInputHeight(value, width, inputFontFamily, inputFontWeight, inputFontSize, inputLetterSpacing, inputLineHeight, inputPadding);
   return {
     ...state,
     inputBoxHeight,
@@ -2507,7 +2544,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
     className: `MaskIcon MaskIcon${icon}`,
-    role: None$1,
+    role: None,
     type
   };
 };
@@ -2523,7 +2560,7 @@ const getButtonVirtualDom = button => {
     className: SourceControlButton,
     name: label,
     title: label,
-    type: Button$2
+    type: Button$1
   }, getIconVirtualDom(icon, Span)];
 };
 
@@ -2595,7 +2632,7 @@ const getFileIconVirtualDom = icon => {
   return {
     childCount: 0,
     className: FileIcon,
-    role: None$1,
+    role: None,
     src: icon,
     type: Img
   };
@@ -2684,7 +2721,7 @@ const getSourceControlListVirtualDom = items => {
     onClick: HandleClickAt,
     onPointerOut: HandleMouseOutAt,
     onPointerOver: HandleMouseOverAt,
-    role: Tree$1,
+    role: Tree,
     type: Div
   }, ...items.flatMap(getSourceControlItemVirtualDom)];
 };
@@ -2829,7 +2866,7 @@ const getActionButtonVirtualDom = action => {
     className: IconButton,
     name: label,
     title: id,
-    type: Button$2
+    type: Button$1
   }, getIconVirtualDom(icon)];
 };
 
@@ -2890,7 +2927,7 @@ const renderEventListeners = () => {
     params: ['handleInput', TargetValue]
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', Button$1, ClientX, ClientY],
+    params: ['handleContextMenu', Button$2, ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleWheel,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@lvce-editor/source-control-worker",
-  "version": "2.19.0",
+  "version": "2.23.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/lvce-editor/source-control-worker.git"
+    "url": "git+https://github.com/lvce-editor/source-control-view.git"
   },
   "license": "MIT",
   "author": "Lvce Editor",