@lvce-editor/output-view 1.2.0 → 1.3.0

package/dist/outputViewWorkerMain.js

@@ -957,7 +957,8 @@ const create$1 = (id, uri, x, y, width, height, workspaceUri) => {
     selectedOption: '',
     smallWidthBreakPoint: 650,
     workspaceUri,
-    options: []
+    options: [],
+    error: ''
   };
   set$1(id, state, state);
 };
@@ -1491,10 +1492,20 @@ const RendererWorker = {
 };
 
 const loadLines = async uri => {
-  // TODO use log stream, updating the output when the file is changed
-  const content = await RendererWorker.invoke('FileSystem.readFile', uri);
-  const lines = content.split('\n');
-  return lines;
+  try {
+    // TODO use log stream, updating the output when the file is changed
+    const content = await RendererWorker.invoke('FileSystem.readFile', uri);
+    const lines = content.split('\n');
+    return {
+      error: '',
+      lines
+    };
+  } catch (error) {
+    return {
+      error: `${error}`,
+      lines: []
+    };
+  }
 };
 
 const isString = value => {
@@ -1509,14 +1520,18 @@ const getSavedCollapsedUris = savedState => {
 const loadContent = async (state, savedState) => {
   const collapsedUris = getSavedCollapsedUris(savedState);
   const selectedUri = getSelectedItem();
-  const lines = await loadLines(selectedUri);
+  const {
+    lines,
+    error
+  } = await loadLines(selectedUri);
   return {
     ...state,
     inputSource: Script,
     listItems: lines,
     collapsedUris,
     options: [],
-    selectedOption: selectedUri
+    selectedOption: selectedUri,
+    error
   };
 };
 
@@ -1606,20 +1621,20 @@ const Actions = 'Actions';
 const Viewlet = 'Viewlet';
 const Output = 'Output';
 
+const parentNode = {
+  type: VirtualDomElements.Div,
+  className: 'Line',
+  childCount: 1
+};
 const getLineDom = line => {
-  return [{
-    type: VirtualDomElements.Div,
-    className: 'Line',
-    childCount: 1
-  }, text(line)];
+  return [parentNode, text(line)];
 };
 
-const getOutputVirtualDom = lines => {
+const getContentDom = (lines, error) => {
+  if (error) {
+    return [];
+  }
   return [{
-    type: VirtualDomElements.Div,
-    className: mergeClassNames(Viewlet, Output),
-    childCount: 1
-  }, {
     type: VirtualDomElements.Div,
     className: 'OutputContent',
     role: 'log',
@@ -1628,8 +1643,28 @@ const getOutputVirtualDom = lines => {
   }, ...lines.flatMap(getLineDom)];
 };
 
+const getErrorDom = error => {
+  if (!error) {
+    return [];
+  }
+  return [{
+    type: VirtualDomElements.Div,
+    className: 'Error',
+    tabIndex: 0,
+    childCount: 1
+  }, text(error)];
+};
+
+const getOutputVirtualDom = (lines, error) => {
+  return [{
+    type: VirtualDomElements.Div,
+    className: mergeClassNames(Viewlet, Output),
+    childCount: 1
+  }, ...getContentDom(lines, error), ...getErrorDom(error)];
+};
+
 const renderItems = (oldState, newState) => {
-  const dom = getOutputVirtualDom(newState.listItems);
+  const dom = getOutputVirtualDom(newState.listItems, newState.error);
   return ['Viewlet.setDom2', dom];
 };
 

package/package.json

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