@lvce-editor/output-view 1.3.0 → 1.5.0

package/dist/outputViewWorkerMain.js

@@ -934,7 +934,8 @@ const Script = 2;
 const {
   get: get$1,
   set: set$1,
-  wrapCommand
+  wrapCommand,
+  wrapGetter
 } = create$2();
 
 const create$1 = (id, uri, x, y, width, height, workspaceUri) => {
@@ -958,7 +959,8 @@ const create$1 = (id, uri, x, y, width, height, workspaceUri) => {
     smallWidthBreakPoint: 650,
     workspaceUri,
     options: [],
-    error: ''
+    error: '',
+    errorCode: 0
   };
   set$1(id, state, state);
 };
@@ -1046,9 +1048,13 @@ const mergeClassNames = (...classNames) => {
 };
 const Div = 4;
 const Text = 12;
+const Select$2 = 63;
+const Option$1 = 64;
 const VirtualDomElements = {
   __proto__: null,
-  Div};
+  Div,
+  Option: Option$1,
+  Select: Select$2};
 const text = data => {
   return {
     type: Text,
@@ -1121,12 +1127,6 @@ const handleError = async state => {
   };
 };
 
-const initialize = async () => {};
-
-const getSelectedItem = platform => {
-  return 'file:///tmp/log-main-process.txt';
-};
-
 const rpcs = Object.create(null);
 const set$g = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1491,6 +1491,10 @@ const RendererWorker = {
   writeClipBoardText
 };
 
+const isFileNotFoundError = error => {
+  return error.message.includes('File not found');
+};
+
 const loadLines = async uri => {
   try {
     // TODO use log stream, updating the output when the file is changed
@@ -1498,16 +1502,68 @@ const loadLines = async uri => {
     const lines = content.split('\n');
     return {
       error: '',
-      lines
+      lines,
+      code: 0
     };
   } catch (error) {
+    if (isFileNotFoundError(error)) {
+      return {
+        error: `log file not found`,
+        lines: [],
+        code: 1
+      };
+    }
     return {
       error: `${error}`,
-      lines: []
+      lines: [],
+      code: 2
     };
   }
 };
 
+const handleSelect = async (state, id) => {
+  const {
+    options
+  } = state;
+  const matchingOption = options.find(option => option.id === id);
+  if (!matchingOption) {
+    return state;
+  }
+  // TODO potential race condtion when switching output channels fast
+  const {
+    lines,
+    error,
+    code
+  } = await loadLines(matchingOption.uri);
+  return {
+    ...state,
+    listItems: lines,
+    error,
+    errorCode: code
+  };
+};
+
+const initialize = async () => {};
+
+const getSelectedItem = platform => {
+  return 'file:///tmp/log-main-process.txt';
+};
+
+const Filter = 'filter';
+const Output$2 = 'output';
+const MainProcess = 'MainProcess';
+const SharedProcess = 'SharedProcess';
+
+const loadOptions = async platform => {
+  return [{
+    id: MainProcess,
+    uri: 'file:///tmp/log-main-process.txt'
+  }, {
+    id: SharedProcess,
+    uri: 'File:///tmp/log-shared-process.txt'
+  }];
+};
+
 const isString = value => {
   return typeof value === 'string';
 };
@@ -1520,18 +1576,21 @@ const getSavedCollapsedUris = savedState => {
 const loadContent = async (state, savedState) => {
   const collapsedUris = getSavedCollapsedUris(savedState);
   const selectedUri = getSelectedItem();
+  const options = await loadOptions();
   const {
     lines,
-    error
+    error,
+    code
   } = await loadLines(selectedUri);
   return {
     ...state,
+    collapsedUris,
+    error,
+    errorCode: code,
     inputSource: Script,
     listItems: lines,
-    collapsedUris,
-    options: [],
-    selectedOption: selectedUri,
-    error
+    options,
+    selectedOption: selectedUri
   };
 };
 
@@ -1543,7 +1602,7 @@ const openFindWidget = async state => {
 };
 
 const Button = 1;
-const Select = 2;
+const Select$1 = 2;
 
 const Blank = 'Blank';
 const ClearAll = 'ClearAll';
@@ -1560,26 +1619,26 @@ const i18nString = (key, placeholders = emptyObject) => {
   return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
-/**
- * @enum {string}
- */
-const UiStrings = {
-  Output: 'output',
-  ClearOutput: 'clear output',
-  TurnOffAutoScroll: 'Turn auto scrolling off',
-  OpenLogFile: 'open output log file'
-};
+const Output$1 = 'output';
+const ClearOutput = 'clear output';
+const TurnOffAutoScroll = 'Turn auto scrolling off';
+const OpenLogFile = 'open output log file';
+const LogFileNotFound$1 = 'The log file was not found.';
+
 const output = () => {
-  return i18nString(UiStrings.Output);
+  return i18nString(Output$1);
 };
 const clearOutput = () => {
-  return i18nString(UiStrings.ClearOutput);
+  return i18nString(ClearOutput);
 };
 const turnOffAutoScroll = () => {
-  return i18nString(UiStrings.TurnOffAutoScroll);
+  return i18nString(TurnOffAutoScroll);
 };
 const openLogFile = () => {
-  return i18nString(UiStrings.OpenLogFile);
+  return i18nString(OpenLogFile);
+};
+const logFileNotFound = () => {
+  return i18nString(LogFileNotFound$1);
 };
 
 const toSelectOption = option => {
@@ -1593,7 +1652,7 @@ const getActions = state => {
     options
   } = state;
   return [{
-    type: Select,
+    type: Select$1,
     id: output(),
     options: toSelectOptions(options)
   }, {
@@ -1611,8 +1670,6 @@ const getActions = state => {
   }];
 };
 
-const Filter = 'filter';
-
 const renderFilterValue = (oldState, newState) => {
   return ['Viewlet.setValueByName', Filter, newState.filterValue];
 };
@@ -1620,6 +1677,8 @@ const renderFilterValue = (oldState, newState) => {
 const Actions = 'Actions';
 const Viewlet = 'Viewlet';
 const Output = 'Output';
+const Option = 'Option';
+const Select = 'Select';
 
 const parentNode = {
   type: VirtualDomElements.Div,
@@ -1643,10 +1702,24 @@ const getContentDom = (lines, error) => {
   }, ...lines.flatMap(getLineDom)];
 };
 
-const getErrorDom = error => {
+const LogFileNotFound = 1;
+
+const getLogFileNotFoundDom = () => {
+  return [{
+    type: VirtualDomElements.Div,
+    className: 'Message',
+    tabIndex: 0,
+    childCount: 1
+  }, text(logFileNotFound())];
+};
+
+const getErrorDom = (errorCode, error) => {
   if (!error) {
     return [];
   }
+  if (errorCode === LogFileNotFound) {
+    return getLogFileNotFoundDom();
+  }
   return [{
     type: VirtualDomElements.Div,
     className: 'Error',
@@ -1655,16 +1728,16 @@ const getErrorDom = error => {
   }, text(error)];
 };
 
-const getOutputVirtualDom = (lines, error) => {
+const getOutputVirtualDom = (lines, errorCode, error) => {
   return [{
     type: VirtualDomElements.Div,
     className: mergeClassNames(Viewlet, Output),
     childCount: 1
-  }, ...getContentDom(lines, error), ...getErrorDom(error)];
+  }, ...getContentDom(lines, error), ...getErrorDom(errorCode, error)];
 };
 
 const renderItems = (oldState, newState) => {
-  const dom = getOutputVirtualDom(newState.listItems, newState.error);
+  const dom = getOutputVirtualDom(newState.listItems, newState.errorCode, newState.error);
   return ['Viewlet.setDom2', dom];
 };
 
@@ -1698,31 +1771,55 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
-const getActionsVirtualDom = actions => {
+const HandleBlur = 'handleBlur';
+const HandleClearFilterClick = 'handleClearFilterClick';
+const HandleContextMenu = 'handleContextMenu';
+const HandleFilterInput = 'handleFilterInput';
+const HandlePointerDown = 'handlePointerDown';
+const HandleSelect = 'handleSelect';
+
+const getOptionVirtualDom = option => {
+  return [{
+    type: VirtualDomElements.Option,
+    className: Option,
+    childCount: 1
+  }, text(option.id)];
+};
+
+const getSelectVirtualDom = options => {
+  return [{
+    type: VirtualDomElements.Select,
+    className: Select,
+    childCount: options.length,
+    name: Output$2,
+    onChange: HandleSelect
+  }, ...options.flatMap(getOptionVirtualDom)];
+};
+
+const getActionsVirtualDom = options => {
   return [{
     type: VirtualDomElements.Div,
     className: Actions,
     role: AriaRoles.ToolBar,
-    childCount: actions.length
-  }];
+    childCount: 1
+  }, ...getSelectVirtualDom(options)];
 };
 
-const renderActions = uid => {
-  const actions = [];
-  const dom = getActionsVirtualDom(actions);
+const renderActions = state => {
+  const {
+    options
+  } = state;
+  const dom = getActionsVirtualDom(options);
   return dom;
 };
 
-const HandleBlur = 'handleBlur';
-const HandleClearFilterClick = 'handleClearFilterClick';
-const HandleContextMenu = 'handleContextMenu';
-const HandleFilterInput = 'handleFilterInput';
-const HandlePointerDown = 'handlePointerDown';
-
 const renderEventListeners = () => {
   return [{
     name: HandleBlur,
     params: ['handleBlur']
+  }, {
+    name: HandleSelect,
+    params: ['handleSelect', 'event.target.value']
   }, {
     name: HandleContextMenu,
     params: ['handleContextMenu', 'event.clientX', 'event.clientY'],
@@ -1766,25 +1863,26 @@ const setOutputChannel = async state => {
 };
 
 const commandMap = {
-  'Output.closeFindWidget': closeFindWidget,
+  'Output.closeFindWidget': wrapCommand(closeFindWidget),
   'Output.create': create$1,
   'Output.diff2': diff2,
   'Output.focusIndex': wrapCommand(focusIndex),
   'Output.getCommandIds': getCommandIds,
   'Output.getKeyBindings': getKeyBindings$1,
-  'Output.handleData': handleData,
-  'Output.handleError': handleError,
+  'Output.handleData': wrapCommand(handleData),
+  'Output.handleError': wrapCommand(handleError),
   'Output.initialize': initialize,
   'Output.loadContent2': wrapCommand(loadContent),
-  'Output.openFindWidget': openFindWidget,
+  'Output.openFindWidget': wrapCommand(openFindWidget),
   'Output.render2': render2,
-  'Output.renderActions': renderActions,
+  'Output.renderActions': wrapGetter(renderActions),
   'Output.renderEventListeners': renderEventListeners,
   'Output.resize': resize,
   'Output.saveState': saveState,
-  'Output.setOutputChannel': setOutputChannel,
+  'Output.setOutputChannel': wrapCommand(setOutputChannel),
   'Output.getActions': getActions,
-  'Output.terminate': terminate
+  'Output.terminate': terminate,
+  'Output.handleSelect': wrapCommand(handleSelect)
 };
 
 const {

package/package.json

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