@lvce-editor/source-control-worker 2.13.0 → 2.15.0

package/dist/sourceControlWorkerMain.js

@@ -1048,6 +1048,7 @@ const TargetValue = 'event.target.value';
 const Enter = 3;
 
 const User = 1;
+const Script = 2;
 
 const CtrlCmd = 1 << 11 >>> 0;
 
@@ -1062,6 +1063,7 @@ const IconThemeWorker = 7009;
 
 const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 
 const List = 1;
@@ -1227,269 +1229,6 @@ const terminate = () => {
   globalThis.close();
 };
 
-const {
-  get: get$1,
-  set,
-  wrapCommand,
-  getCommandIds,
-  registerCommands,
-  wrapGetter
-} = create();
-
-const create2 = (id, uri, x, y, width, height, workspacePath) => {
-  const state = {
-    actionsCache: Object.create(null),
-    allGroups: [],
-    deltaY: 0,
-    enabledProviderIds: [],
-    fileIconCache: Object.create(null),
-    finalDeltaY: 0,
-    gitRoot: '',
-    handleOffset: 0,
-    headerHeight: 40,
-    // TODO
-    height,
-    id,
-    index: [],
-    inputValue: '',
-    expandedGroups: Object.create(null),
-    itemHeight: 20,
-    items: [],
-    maxLineY: 0,
-    merge: [],
-    minimumSliderSize: 20,
-    inputBoxHeight: 30,
-    minLineY: 0,
-    providerId: '',
-    root: '',
-    scrollBarActive: false,
-    scrollBarHeight: 0,
-    splitButtonEnabled: false,
-    untracked: [],
-    visibleItems: [],
-    width,
-    workingTree: [],
-    workspacePath,
-    x,
-    y,
-    inputPlaceholder: '',
-    inputSource: 0,
-    maxInputLines: 5,
-    inputFontFamily: 'system-ui, Ubuntu, "Droid Sans", sans-serif',
-    inputFontSize: 13,
-    inputFontWeight: 400,
-    inputLetterSpacing: 0,
-    inputLineHeight: 20,
-    inputBoxMaxHeight: 214,
-    history: [],
-    viewMode: 1,
-    iconDefinitions: [],
-    decorationIcons: []
-  };
-  set(id, state, state);
-};
-
-const isEqual$2 = (oldState, newState) => {
-  return oldState.inputBoxHeight === newState.inputBoxHeight;
-};
-
-const isEqual$1 = (oldState, newState) => {
-  return oldState.allGroups === newState.allGroups && oldState.deltaY === newState.deltaY && oldState.items === newState.items && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.visibleItems === newState.visibleItems;
-};
-
-const RenderItems = 4;
-const RenderValue = 8;
-const RenderCss = 10;
-
-const isEqual = (oldState, newState) => {
-  return newState.inputSource === User || oldState.inputValue === newState.inputValue;
-};
-
-const modules = [isEqual$1, isEqual, isEqual$2];
-const numbers = [RenderItems, RenderValue, RenderCss];
-
-const diff = (oldState, newState) => {
-  const diffResult = [];
-  for (let i = 0; i < modules.length; i++) {
-    const fn = modules[i];
-    if (!fn(oldState, newState)) {
-      diffResult.push(numbers[i]);
-    }
-  }
-  return diffResult;
-};
-
-const diff2 = uid => {
-  const {
-    oldState,
-    newState
-  } = get$1(uid);
-  const result = diff(oldState, newState);
-  return result;
-};
-
-const getInfo = uid => {
-  const {
-    newState
-  } = get$1(uid);
-  return newState.allGroups;
-};
-
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
-const text = data => {
-  return {
-    type: Text,
-    text: data,
-    childCount: 0
-  };
-};
-
-const getKeyBindings = () => {
-  return [{
-    key: CtrlCmd | Enter,
-    command: 'Source Control.acceptInput',
-    when: FocusSourceControlInput
-  }];
-};
-
-const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
-const i18nString = (key, placeholders = emptyObject) => {
-  if (placeholders === emptyObject) {
-    return key;
-  }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
-};
-
-const OpenChanges = 'Open Changes';
-const OpenFile = 'Open File';
-const OpenFileHead = 'Open File (HEAD)';
-const DiscardChanges = 'Discard Changes';
-const StageChanges = 'Stage Changes';
-const AddToGitignore = 'Add to gitignore';
-const RevealInExplorerView = 'Reveal in Explorer View';
-const OpenContainingFolder = 'Open Containing Folder';
-const MessageEnterToCommitOnMaster = `Message (Enter) to commit on 'master'`;
-const SourceControlInput$1 = 'Source Control Input';
-
-const openChanges = () => {
-  return i18nString(OpenChanges);
-};
-const openFile = () => {
-  return i18nString(OpenFile);
-};
-const openFileHead = () => {
-  return i18nString(OpenFileHead);
-};
-const discardChanges = () => {
-  return i18nString(DiscardChanges);
-};
-const stageChanges = () => {
-  return i18nString(StageChanges);
-};
-const addToGitignore = () => {
-  return i18nString(AddToGitignore);
-};
-const revealInExplorerView = () => {
-  return i18nString(RevealInExplorerView);
-};
-const openContainingFolder = () => {
-  return i18nString(OpenContainingFolder);
-};
-const messageEnterToCommitOnMaster = () => {
-  return i18nString(MessageEnterToCommitOnMaster);
-};
-const sourceControlInput = () => {
-  return i18nString(SourceControlInput$1);
-};
-
-const getMenuEntries = () => {
-  return [{
-    label: openChanges(),
-    flags: None,
-    command: /* TODO */'-1',
-    id: ''
-  }, {
-    label: openFile(),
-    flags: None,
-    command: /* TODO */'-1',
-    id: ''
-  }, {
-    label: openFileHead(),
-    flags: None,
-    command: /* TODO */'-1',
-    id: ''
-  }, {
-    label: discardChanges(),
-    flags: None,
-    command: /* TODO */'-1',
-    id: ''
-  }, {
-    label: stageChanges(),
-    flags: None,
-    command: /* TODO */'-1',
-    id: ''
-  }, {
-    label: addToGitignore(),
-    flags: None,
-    command: /* TODO */'-1',
-    id: ''
-  }, {
-    label: revealInExplorerView(),
-    flags: None,
-    command: /* TODO */'-1',
-    id: ''
-  }, {
-    label: openContainingFolder(),
-    flags: None,
-    command: /* TODO */'-1',
-    id: ''
-  }];
-};
-
-const getMenuEntries2 = state => {
-  return getMenuEntries();
-};
-
-const getMenuIds = () => {
-  return [SourceControl$1];
-};
-
-const activateByEvent = event => {
-  return activateByEvent$1(event);
-};
-
-const executeProvider = async ({
-  event,
-  method,
-  params
-}) => {
-  await activateByEvent(event);
-  // @ts-ignore
-  const result = await invoke$1(method, ...params);
-  return result;
-};
-
-const CommandExecute = 'ExtensionHostCommand.executeCommand';
-const SourceControlGetFileDecorations = 'ExtensionHostSourceControl.getFileDecorations';
-const SourceControlGetEnabledProviderIds = 'ExtensionHostSourceControl.getEnabledProviderIds';
-const SourceControlGetFileBefore = 'ExtensionHostSourceControl.getFileBefore';
-const SourceControlGetGroups = 'ExtensionHostSourceControl.getGroups';
-
-const executeCommand = (id, ...args) => {
-  return executeProvider({
-    event: `onCommand:${id}`,
-    method: CommandExecute,
-    params: [id, ...args]
-  });
-};
-
 const getActualDecorationIcon = (iconDefinitions, icon) => {
   if (typeof icon === 'number') {
     const value = iconDefinitions[icon];
@@ -1642,6 +1381,36 @@ const getFinalDeltaY = (height, itemHeight, itemsLength) => {
   return finalDeltaY;
 };
 
+const activateByEvent = event => {
+  return activateByEvent$1(event);
+};
+
+const executeProvider = async ({
+  event,
+  method,
+  params
+}) => {
+  await activateByEvent(event);
+  // @ts-ignore
+  const result = await invoke$1(method, ...params);
+  return result;
+};
+
+const CommandExecute = 'ExtensionHostCommand.executeCommand';
+const SourceControlAcceptInput = 'ExtensionHostSourceControl.acceptInput';
+const SourceControlGetFileDecorations = 'ExtensionHostSourceControl.getFileDecorations';
+const SourceControlGetEnabledProviderIds = 'ExtensionHostSourceControl.getEnabledProviderIds';
+const SourceControlGetFileBefore = 'ExtensionHostSourceControl.getFileBefore';
+const SourceControlGetGroups = 'ExtensionHostSourceControl.getGroups';
+
+const acceptInput$2 = async (providerId, text) => {
+  return executeProvider({
+    event: 'none',
+    method: SourceControlAcceptInput,
+    params: [providerId, text]
+    // noProviderFoundMessage: 'No source control provider found',
+  });
+};
 const getFileDecorations$1 = (providerId, uris) => {
   return executeProvider({
     event: 'none',
@@ -1679,6 +1448,11 @@ const getIconDefinitions$1 = async providerId => {
   return result;
 };
 
+const acceptInput$1 = (providerId, text) => {
+  string(providerId);
+  string(text);
+  return acceptInput$2(providerId, text);
+};
 const getFileDecorations = (providerId, uris) => {
   return getFileDecorations$1(providerId, uris);
 };
@@ -1799,7 +1573,7 @@ const getVisibleSourceControlItems = (items, minLineY, maxLineY, actionsCache, f
   return visible;
 };
 
-const get = key => {
+const get$1 = key => {
   return getPreference(key);
 };
 
@@ -1819,35 +1593,89 @@ const requestSourceActions = async () => {
   }
   return newCache;
 };
-
-/* eslint-disable unicorn/no-array-reduce */
-const restoreExpandedGroups = groups => {
-  return groups.map(group => group.id).reduce((total, current) => {
-    return {
-      ...total,
-      [current]: true
-    };
-  }, Object.create(null));
+
+/* eslint-disable unicorn/no-array-reduce */
+const restoreExpandedGroups = groups => {
+  return groups.map(group => group.id).reduce((total, current) => {
+    return {
+      ...total,
+      [current]: true
+    };
+  }, Object.create(null));
+};
+
+const getRestoredInputValue = savedState => {
+  if (savedState && typeof savedState === 'object' && 'inputValue' in savedState && typeof savedState['inputValue'] === 'string') {
+    return savedState.inputValue;
+  }
+  return '';
+};
+const restoreState = savedState => {
+  const inputValue = getRestoredInputValue(savedState);
+  return {
+    inputValue
+  };
+};
+
+const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
+  if (size >= contentSize) {
+    return 0;
+  }
+  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
+};
+
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
+  }
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
+};
+
+const OpenChanges = 'Open Changes';
+const OpenFile = 'Open File';
+const OpenFileHead = 'Open File (HEAD)';
+const DiscardChanges = 'Discard Changes';
+const StageChanges = 'Stage Changes';
+const AddToGitignore = 'Add to gitignore';
+const RevealInExplorerView = 'Reveal in Explorer View';
+const OpenContainingFolder = 'Open Containing Folder';
+const MessageEnterToCommitOnMaster = `Message (Enter) to commit on 'master'`;
+const SourceControlInput$1 = 'Source Control Input';
+
+const openChanges = () => {
+  return i18nString(OpenChanges);
+};
+const openFile = () => {
+  return i18nString(OpenFile);
+};
+const openFileHead = () => {
+  return i18nString(OpenFileHead);
+};
+const discardChanges = () => {
+  return i18nString(DiscardChanges);
+};
+const stageChanges = () => {
+  return i18nString(StageChanges);
+};
+const addToGitignore = () => {
+  return i18nString(AddToGitignore);
 };
-
-const getRestoredInputValue = savedState => {
-  if (savedState && typeof savedState === 'object' && 'inputValue' in savedState && typeof savedState['inputValue'] === 'string') {
-    return savedState.inputValue;
-  }
-  return '';
+const revealInExplorerView = () => {
+  return i18nString(RevealInExplorerView);
 };
-const restoreState = savedState => {
-  const inputValue = getRestoredInputValue(savedState);
-  return {
-    inputValue
-  };
+const openContainingFolder = () => {
+  return i18nString(OpenContainingFolder);
 };
-
-const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
-  if (size >= contentSize) {
-    return 0;
-  }
-  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
+const messageEnterToCommitOnMaster = () => {
+  return i18nString(MessageEnterToCommitOnMaster);
+};
+const sourceControlInput = () => {
+  return i18nString(SourceControlInput$1);
 };
 
 const loadContent = async (state, savedState) => {
@@ -1880,7 +1708,7 @@ const loadContent = async (state, savedState) => {
   const actionsCache = await requestSourceActions();
 
   // TODO make preferences async and more functional
-  const splitButtonEnabled = await get('sourceControl.splitButtonEnabled');
+  const splitButtonEnabled = await get$1('sourceControl.splitButtonEnabled');
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
@@ -1915,6 +1743,228 @@ const loadContent = async (state, savedState) => {
   };
 };
 
+const info = (...args) => {
+  // @ts-ignore
+  // eslint-disable-next-line no-console
+  console.info(...args);
+};
+const warn = (...args) => {
+  // @ts-ignore
+  console.warn(...args);
+};
+
+const acceptInput = async state => {
+  const {
+    inputValue,
+    enabledProviderIds
+  } = state;
+  if (enabledProviderIds.length === 0) {
+    info('[ViewletSourceControl] no source control provider found');
+    return state;
+  }
+  const providerId = enabledProviderIds[0];
+  await acceptInput$1(providerId, inputValue);
+  const newState = await loadContent(state, {});
+  return {
+    ...newState,
+    inputValue: ''
+  };
+};
+
+const {
+  get,
+  set,
+  wrapCommand,
+  getCommandIds,
+  registerCommands,
+  wrapGetter
+} = create();
+
+const create2 = (id, uri, x, y, width, height, workspacePath) => {
+  const state = {
+    actionsCache: Object.create(null),
+    allGroups: [],
+    deltaY: 0,
+    enabledProviderIds: [],
+    fileIconCache: Object.create(null),
+    finalDeltaY: 0,
+    gitRoot: '',
+    handleOffset: 0,
+    headerHeight: 40,
+    // TODO
+    height,
+    id,
+    index: [],
+    inputValue: '',
+    expandedGroups: Object.create(null),
+    itemHeight: 20,
+    items: [],
+    maxLineY: 0,
+    merge: [],
+    minimumSliderSize: 20,
+    inputBoxHeight: 30,
+    minLineY: 0,
+    providerId: '',
+    root: '',
+    scrollBarActive: false,
+    scrollBarHeight: 0,
+    splitButtonEnabled: false,
+    untracked: [],
+    visibleItems: [],
+    width,
+    workingTree: [],
+    workspacePath,
+    x,
+    y,
+    inputPlaceholder: '',
+    inputSource: 0,
+    maxInputLines: 5,
+    inputFontFamily: 'system-ui, Ubuntu, "Droid Sans", sans-serif',
+    inputFontSize: 13,
+    inputFontWeight: 400,
+    inputLetterSpacing: 0,
+    inputLineHeight: 20,
+    inputBoxMaxHeight: 214,
+    history: [],
+    viewMode: 1,
+    iconDefinitions: [],
+    decorationIcons: [],
+    focus: 0
+  };
+  set(id, state, state);
+};
+
+const isEqual$3 = (oldState, newState) => {
+  return oldState.inputBoxHeight === newState.inputBoxHeight;
+};
+
+const isEqual$2 = (oldState, newState) => {
+  return oldState.focus === newState.focus;
+};
+
+const isEqual$1 = (oldState, newState) => {
+  return oldState.allGroups === newState.allGroups && oldState.deltaY === newState.deltaY && oldState.items === newState.items && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.visibleItems === newState.visibleItems;
+};
+
+const RenderItems = 4;
+const RenderFocusContext = 7;
+const RenderValue = 8;
+const RenderCss = 10;
+
+const isEqual = (oldState, newState) => {
+  return newState.inputSource === User || oldState.inputValue === newState.inputValue;
+};
+
+const modules = [isEqual$1, isEqual, isEqual$3, isEqual$2];
+const numbers = [RenderItems, RenderValue, RenderCss, RenderFocusContext];
+
+const diff = (oldState, newState) => {
+  const diffResult = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
+    }
+  }
+  return diffResult;
+};
+
+const diff2 = uid => {
+  const {
+    oldState,
+    newState
+  } = get(uid);
+  const result = diff(oldState, newState);
+  return result;
+};
+
+const getInfo = uid => {
+  const {
+    newState
+  } = get(uid);
+  return newState.allGroups;
+};
+
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
+const text = data => {
+  return {
+    type: Text,
+    text: data,
+    childCount: 0
+  };
+};
+
+const getKeyBindings = () => {
+  return [{
+    key: CtrlCmd | Enter,
+    command: 'Source Control.acceptInput',
+    when: FocusSourceControlInput
+  }];
+};
+
+const getMenuEntries = () => {
+  return [{
+    label: openChanges(),
+    flags: None,
+    command: /* TODO */'-1',
+    id: ''
+  }, {
+    label: openFile(),
+    flags: None,
+    command: /* TODO */'-1',
+    id: ''
+  }, {
+    label: openFileHead(),
+    flags: None,
+    command: /* TODO */'-1',
+    id: ''
+  }, {
+    label: discardChanges(),
+    flags: None,
+    command: /* TODO */'-1',
+    id: ''
+  }, {
+    label: stageChanges(),
+    flags: None,
+    command: /* TODO */'-1',
+    id: ''
+  }, {
+    label: addToGitignore(),
+    flags: None,
+    command: /* TODO */'-1',
+    id: ''
+  }, {
+    label: revealInExplorerView(),
+    flags: None,
+    command: /* TODO */'-1',
+    id: ''
+  }, {
+    label: openContainingFolder(),
+    flags: None,
+    command: /* TODO */'-1',
+    id: ''
+  }];
+};
+
+const getMenuEntries2 = state => {
+  return getMenuEntries();
+};
+
+const getMenuIds = () => {
+  return [SourceControl$1];
+};
+
+const executeCommand = (id, ...args) => {
+  return executeProvider({
+    event: `onCommand:${id}`,
+    method: CommandExecute,
+    params: [id, ...args]
+  });
+};
+
 const handleButtonClick = async (state, clickedIndex) => {
   const {
     visibleItems
@@ -1940,11 +1990,6 @@ const getIndex = (state, eventX, eventY) => {
   return index;
 };
 
-const warn = (...args) => {
-  // @ts-ignore
-  console.warn(...args);
-};
-
 const refresh = async state => {
   const {
     itemHeight,
@@ -2135,8 +2180,12 @@ const handleContextMenu = async (state, button, x, y) => {
   return state;
 };
 
-const handleFocus = async state => {
-  return state;
+const handleInputFocus = async state => {
+  return {
+    ...state,
+    focus: FocusSourceControlInput,
+    inputSource: Script
+  };
 };
 
 const handleInput = async (state, value, inputSource = User) => {
@@ -2157,6 +2206,11 @@ const handleInput = async (state, value, inputSource = User) => {
   };
 };
 
+const handleInputBlur = async state => {
+  // TODO reset focus
+  return state;
+};
+
 const handleMessagePort = async port => {
   await PlainMessagePortRpc.create({
     commandMap: {},
@@ -2282,6 +2336,14 @@ const renderCss = (oldState, newState) => {
   return [SetCss, id, css];
 };
 
+const renderFocusContext = (oldState, newState) => {
+  const {
+    id,
+    focus
+  } = newState;
+  return [SetFocusContext, id, focus];
+};
+
 const Actions = 'Actions';
 const SourceControlButtons = 'SourceControlButtons';
 const Grow = 'Grow';
@@ -2607,6 +2669,8 @@ const getRenderer = diffType => {
       return renderValue;
     case RenderCss:
       return renderCss;
+    case RenderFocusContext:
+      return renderFocusContext;
     default:
       throw new Error('unknown renderer');
   }
@@ -2628,7 +2692,7 @@ const render2 = (uid, diffResult) => {
   const {
     oldState,
     newState
-  } = get$1(uid);
+  } = get(uid);
   set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
@@ -2712,7 +2776,7 @@ const renderEventListeners = () => {
 
 const saveState = uid => {
   number(uid);
-  const value = get$1(uid);
+  const value = get(uid);
   const {
     newState
   } = value;
@@ -2763,6 +2827,7 @@ const viewAsTree = state => {
 
 const commandMap = {
   'Initialize.initialize': initialize,
+  'SourceControl.acceptInput': wrapCommand(acceptInput),
   'SourceControl.create2': create2,
   'SourceControl.diff2': diff2,
   'SourceControl.getCommandIds': getCommandIds,
@@ -2776,8 +2841,9 @@ const commandMap = {
   'SourceControl.handleClickAt': wrapCommand(handleClickAt),
   'SourceControl.handleClickSourceControlButtons': wrapCommand(handleClickSourceControlButtons),
   'SourceControl.handleContextMenu': wrapCommand(handleContextMenu),
-  'SourceControl.handleFocus': wrapCommand(handleFocus),
+  'SourceControl.handleFocus': wrapCommand(handleInputFocus),
   'SourceControl.handleInput': wrapCommand(handleInput),
+  'SourceControl.handleInputBlur': wrapCommand(handleInputBlur),
   'SourceControl.handleMessagePort': handleMessagePort,
   'SourceControl.handleMouseOut': wrapCommand(handleMouseOut),
   'SourceControl.handleMouseOutAt': wrapCommand(handleMouseOutAt),

package/package.json

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