@lvce-editor/output-view 1.15.0 → 1.17.0

package/dist/outputViewWorkerMain.js

@@ -1008,7 +1008,7 @@ const WebWorkerRpcClient = {
   create: create$4
 };
 
-const toCommandId$1 = key => {
+const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
@@ -1080,7 +1080,7 @@ const create$2 = () => {
     },
     getCommandIds() {
       const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId$1);
+      const ids = keys.map(toCommandId);
       return ids;
     },
     registerCommands(commandMap) {
@@ -1302,7 +1302,7 @@ const filterItems = (items, filterValue) => {
 };
 
 const isFileNotFoundError = error => {
-  return error.message.includes('File not found');
+  return error?.message?.includes('File not found') ?? false;
 };
 
 const loadLines = async uri => {
@@ -1376,7 +1376,8 @@ const {
   set: set$2,
   wrapCommand,
   wrapGetter,
-  getKeys
+  getKeys,
+  getCommandIds
 } = create$2();
 
 const create = (id, uri, x, y, width, height, platform, parentId) => {
@@ -1486,18 +1487,6 @@ const focusIndex = (state, index) => {
   };
 };
 
-const commandMapRef = {};
-
-const toCommandId = key => {
-  const dotIndex = key.indexOf('.');
-  return key.slice(dotIndex + 1);
-};
-const getCommandIds = () => {
-  const keys = Object.keys(commandMapRef);
-  const ids = keys.map(toCommandId);
-  return ids;
-};
-
 const ToolBar = 'toolbar';
 const AriaRoles = {
   __proto__: null,
@@ -1597,12 +1586,12 @@ const getKeyBindings = () => {
   }];
 };
 
-const Filter = 'filter';
+const Filter$1 = 'filter';
 const Output$1 = 'output';
 const MainProcess = 'MainProcess';
 const SharedProcess = 'SharedProcess';
 const Clear = 'Clear';
-const Settings = 'Settings';
+const Settings$1 = 'Settings';
 const ScrollLock = 'ScrollLock';
 
 const noop = async state => {
@@ -1794,25 +1783,58 @@ const initialize = async () => {
 
 const Web = 1;
 
-const getSelectedItem = platform => {
+const getSelectedItem = (selectedOption, platform) => {
+  if (selectedOption) {
+    return selectedOption;
+  }
   if (platform === Web) {
     return '';
   }
   return MainProcess;
 };
 
+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 ClearOutput = 'clear output';
+const LogFileNotFound$1 = 'The log file was not found.';
+const Settings = 'Settings';
+const TurnOffAutoScroll = 'Turn auto scrolling off';
+
+const clearOutput = () => {
+  return i18nString(ClearOutput);
+};
+const turnOffAutoScroll = () => {
+  return i18nString(TurnOffAutoScroll);
+};
+const settings = () => {
+  return i18nString(Settings);
+};
+const logFileNotFound = () => {
+  return i18nString(LogFileNotFound$1);
+};
+
 const loadButtons = () => {
   return [{
     id: Clear,
-    label: 'Clear',
+    label: clearOutput(),
     icon: 'MaskIconClearAll'
   }, {
     id: ScrollLock,
-    label: 'Scroll Lock',
+    label: turnOffAutoScroll(),
     icon: 'MaskIconListFlat'
   }, {
-    id: Settings,
-    label: 'Settings',
+    id: Settings$1,
+    label: settings(),
     icon: 'MaskIconSettingsGear'
   }];
 };
@@ -1852,6 +1874,35 @@ const loadOptions = async platform => {
   }, ...extensionOptions];
 };
 
+const getSavedFilterValue = savedState => {
+  if (savedState && typeof savedState.filterValue === 'string') {
+    return savedState.filterValue;
+  }
+  return '';
+};
+const getSavedSelectedOption = savedState => {
+  if (savedState && typeof savedState.selectedOption === 'string') {
+    return savedState.selectedOption;
+  }
+  return '';
+};
+const getSavedScrollLockEnabled = savedState => {
+  if (savedState && typeof savedState.scrollLockEnabled === 'boolean') {
+    return savedState.scrollLockEnabled;
+  }
+  return false;
+};
+const restoreState = savedState => {
+  const filterValue = getSavedFilterValue(savedState);
+  const selectedOption = getSavedSelectedOption(savedState);
+  const scrollLockEnabled = getSavedScrollLockEnabled(savedState);
+  return {
+    filterValue,
+    selectedOption,
+    scrollLockEnabled
+  };
+};
+
 const isString = value => {
   return typeof value === 'string';
 };
@@ -1870,7 +1921,12 @@ const loadContent = async (state, savedState) => {
     watchId
   } = state;
   const collapsedUris = getSavedCollapsedUris(savedState);
-  const selectedId = getSelectedItem(platform);
+  const {
+    selectedOption,
+    filterValue,
+    scrollLockEnabled
+  } = restoreState(savedState);
+  const selectedId = getSelectedItem(selectedOption, platform);
   const options = await loadOptions(platform);
   const option = getMatchingOpen(options, selectedId);
   if (!option) {
@@ -1884,20 +1940,23 @@ const loadContent = async (state, savedState) => {
     error,
     code
   } = await loadLines(uri);
+  const filteredItems = filterItems(lines, filterValue);
   const newWatchId = createWatchId();
   await setupChangeListener(watchId, newWatchId, uri);
   const buttons = loadButtons();
   return {
     ...state,
+    buttons,
     collapsedUris,
     error,
     errorCode: code,
+    filteredItems,
+    filterValue,
     inputSource: Script,
     listItems: lines,
-    filteredItems: lines,
     options,
+    scrollLockEnabled,
     selectedOption: selectedId,
-    buttons,
     watchId: newWatchId
   };
 };
@@ -1939,20 +1998,27 @@ const refresh = async state => {
 };
 
 const renderFilterValue = (oldState, newState) => {
-  return ['Viewlet.setValueByName', newState.parentId, Filter, newState.filterValue];
+  return ['Viewlet.setValueByName', newState.parentId, Filter$1, newState.filterValue];
 };
 
+const Filter = 'Filter';
 const IconButton = 'IconButton';
+const InputBox = 'InputBox';
 const MaskIcon = 'MaskIcon';
+const FilterInput = 'FilterInput';
+const OutputContent = 'OutputContent';
 const Actions = 'Actions';
+const Message = 'Message';
 const Viewlet = 'Viewlet';
 const Output = 'Output';
 const Option = 'Option';
 const Select = 'Select';
+const Error$1 = 'Error';
+const Line = 'Line';
 
 const parentNode = {
   type: VirtualDomElements.Div,
-  className: 'Line',
+  className: Line,
   childCount: 1
 };
 const getLineDom = line => {
@@ -1965,37 +2031,19 @@ const getContentDom = (lines, error) => {
   }
   return [{
     type: VirtualDomElements.Div,
-    className: 'OutputContent',
+    className: OutputContent,
     role: 'log',
     tabIndex: 0,
     childCount: lines.length
   }, ...lines.flatMap(getLineDom)];
 };
 
-const LogFileNotFound$1 = 1;
-
-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 LogFileNotFound = 'The log file was not found.';
-
-const logFileNotFound = () => {
-  return i18nString(LogFileNotFound);
-};
+const LogFileNotFound = 1;
 
 const getLogFileNotFoundDom = () => {
   return [{
     type: VirtualDomElements.Div,
-    className: 'Message',
+    className: Message,
     tabIndex: 0,
     childCount: 1
   }, text(logFileNotFound())];
@@ -2005,12 +2053,12 @@ const getErrorDom = (errorCode, error) => {
   if (!error) {
     return [];
   }
-  if (errorCode === LogFileNotFound$1) {
+  if (errorCode === LogFileNotFound) {
     return getLogFileNotFoundDom();
   }
   return [{
     type: VirtualDomElements.Div,
-    className: 'Error',
+    className: Error$1,
     tabIndex: 0,
     childCount: 1
   }, text(error)];
@@ -2102,15 +2150,15 @@ const getFilterVirtualDom = () => {
   const placeholder = 'Filter';
   return [{
     type: VirtualDomElements.Div,
-    className: 'Filter',
+    className: Filter,
     childCount: 1
   }, {
     type: VirtualDomElements.Input,
-    className: 'InputBox FilterInput',
+    className: mergeClassNames(InputBox, FilterInput),
     childCount: 0,
     placeholder,
     onInput: HandleFilterInput,
-    name: Filter
+    name: Filter$1
   }];
 };
 
@@ -2206,12 +2254,14 @@ const saveState = state => {
   const {
     filterValue,
     collapsedUris,
-    selectedOption
+    selectedOption,
+    scrollLockEnabled
   } = state;
   return {
     filterValue,
     collapsedUris,
-    selectedOption
+    selectedOption,
+    scrollLockEnabled
   };
 };
 
@@ -2256,13 +2306,15 @@ const commandMap = {
   'Output.renderEventListeners': renderEventListeners,
   'Output.resize': resize,
   'Output.saveOutputAs': wrapCommand(saveOutputAs),
-  'Output.saveState': saveState,
+  'Output.saveState': wrapGetter(saveState),
   'Output.selectChannel': wrapCommand(selectChannel),
   'Output.setLogLevel': setLogLevel,
   'Output.setOutputChannel': wrapCommand(setOutputChannel),
   'Output.terminate': terminate
 };
 
+const commandMapRef = {};
+
 const listen = async () => {
   Object.assign(commandMapRef, commandMap);
   const rpc = await WebWorkerRpcClient.create({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/output-view",
-  "version": "1.15.0",
+  "version": "1.17.0",
   "description": "Output View Worker",
   "repository": {
     "type": "git",