@lvce-editor/problems-view 1.8.0 → 1.10.0

package/dist/problemsViewWorkerMain.js

@@ -423,9 +423,103 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   listen: listen$6,
   wrap: wrap$e
 };
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
+const getFirstEvent = (eventEmitter, eventMap) => {
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  const listenerMap = Object.create(null);
+  const cleanup = value => {
+    for (const event of Object.keys(eventMap)) {
+      removeListener(eventEmitter, event, listenerMap[event]);
+    }
+    resolve(value);
+  };
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = event => {
+      cleanup({
+        type,
+        event
+      });
+    };
+    addListener(eventEmitter, event, listener);
+    listenerMap[event] = listener;
+  }
+  return promise;
+};
+const Message$1$1 = 3;
+const create$5$1 = async ({
+  messagePort,
+  isMessagePortOpen
+}) => {
+  if (!isMessagePort(messagePort)) {
+    throw new IpcError('port must be of type MessagePort');
+  }
+  if (isMessagePortOpen) {
+    return messagePort;
+  }
+  const eventPromise = getFirstEvent(messagePort, {
+    message: Message$1$1
+  });
+  messagePort.start();
+  const {
+    type,
+    event
+  } = await eventPromise;
+  if (type !== Message$1$1) {
+    throw new IpcError('Failed to wait for ipc message');
+  }
+  if (event.data !== readyMessage) {
+    throw new IpcError('unexpected first message');
+  }
+  return messagePort;
+};
+const signal$1 = messagePort => {
+  messagePort.start();
+};
+class IpcParentWithMessagePort extends Ipc {
+  getData = getData$2;
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    this._rawIpc.close();
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+  onClose(callback) {}
+}
+const wrap$5 = messagePort => {
+  return new IpcParentWithMessagePort(messagePort);
+};
+const IpcParentWithMessagePort$1 = {
+  __proto__: null,
+  create: create$5$1,
+  signal: signal$1,
+  wrap: wrap$5
+};
 
 const Two = '2.0';
-const create$4 = (method, params) => {
+const create$4$1 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -433,7 +527,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
+const set$4 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -452,7 +546,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$2(id, resolve);
+  set$4(id, resolve);
   return {
     id,
     promise
@@ -679,7 +773,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$6 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -688,7 +782,7 @@ const create$5 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$6(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -792,11 +886,11 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const responseMessage = await promise;
   return unwrapJsonRpcResult(responseMessage);
 };
-const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
+const send$1 = (transport, method, ...params) => {
+  const message = create$4$1(method, params);
   transport.send(message);
 };
-const invoke = (ipc, method, ...params) => {
+const invoke$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer = (ipc, method, ...params) => {
@@ -826,10 +920,10 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
+      send$1(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke(ipc, method, ...params);
+      return invoke$1(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -870,7 +964,41 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+const create$5 = async ({
+  commandMap,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    messagePort,
+    isMessagePortOpen: true
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
+};
 const create$3 = async ({
+  commandMap,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$5({
+    commandMap,
+    messagePort: port2
+  });
+};
+const TransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$3
+};
+const create$4 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -882,7 +1010,7 @@ const create$3 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$3
+  create: create$4
 };
 
 const create$2 = () => {
@@ -980,22 +1108,38 @@ const create$1 = rpcId => {
     }
   };
 };
+const EditorWorker$1 = 99;
 const RendererWorker$1 = 1;
+const {
+  invoke: invoke$c,
+  set: set$c} = create$1(EditorWorker$1);
+const EditorWorker = {
+  __proto__: null,
+  invoke: invoke$c,
+  set: set$c};
 const {
   invoke: invoke$3,
+  invokeAndTransfer: invokeAndTransfer$3,
   set: set$3} = create$1(RendererWorker$1);
+const sendMessagePortToEditorWorker$1 = async (port, rpcId) => {
+  const command = 'HandleMessagePort.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer$3('SendMessagePortToExtensionHostWorker.sendMessagePortToEditorWorker', port, command, rpcId);
+};
 const writeClipBoardText$1 = async text => {
   await invoke$3('ClipBoard.writeText', /* text */text);
 };
 const RendererWorker = {
   __proto__: null,
+  sendMessagePortToEditorWorker: sendMessagePortToEditorWorker$1,
   set: set$3,
   writeClipBoardText: writeClipBoardText$1
 };
 
 const {
-  set: set$1,
-  writeClipBoardText
+  set: set$2,
+  writeClipBoardText,
+  sendMessagePortToEditorWorker
 } = RendererWorker;
 
 const writeText = async text => {
@@ -1017,7 +1161,7 @@ const Script = 2;
 
 const {
   get,
-  set,
+  set: set$1,
   wrapCommand
 } = create$2();
 
@@ -1025,10 +1169,9 @@ const None$1 = 0;
 const Table = 1;
 const List = 2;
 
-const create = (id, uri, x, y, width, height, args, parentUid) => {
+const create = (id, uri, x, y, width, height, workspaceUri) => {
   const state = {
     uid: id,
-    parentUid,
     problems: [],
     focusedIndex: -2,
     message: '',
@@ -1045,9 +1188,10 @@ const create = (id, uri, x, y, width, height, args, parentUid) => {
     listItems: [],
     collapsedUris: [],
     smallWidthBreakPoint: 650,
-    filteredProblems: []
+    filteredProblems: [],
+    workspaceUri
   };
-  set(id, state, state);
+  set$1(id, state, state);
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -1055,7 +1199,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.problems === newState.problems && oldState.filterValue === newState.filterValue;
+  return oldState.problems === newState.problems && oldState.filterValue === newState.filterValue && oldState.message === newState.message;
 };
 
 const RenderItems = 1;
@@ -1309,6 +1453,10 @@ const handleClickAt = (state, eventX, eventY) => {
   };
 };
 
+const handleClickButton = async (state, name) => {
+  return state;
+};
+
 const handleContextMenu = async (state, eventX, eventY) => {
   // @ts-ignore
   // await ContextMenu.show(eventX, eventY, MenuEntryId.Problems)
@@ -1330,13 +1478,139 @@ const handleIconThemeChange = state => {
   };
 };
 
+const send = port => {
+  return sendMessagePortToEditorWorker(port, 0);
+};
+const createEditorWorkerRpc = async () => {
+  try {
+    const rpc = await TransferMessagePortRpcParent.create({
+      commandMap: {},
+      send
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create editor worker rpc`);
+  }
+};
+
+const {
+  invoke,
+  set} = EditorWorker;
+
 const initialize = async () => {
-  // TODO create connection to editor worker
+  const rpc = await createEditorWorkerRpc();
+  set(rpc);
 };
 
-const getProblems = async state => {
-  // TODO ask editor worker for problems
-  return [];
+const toProblem = (diagnostic, index) => {
+  const {
+    message,
+    rowIndex,
+    columnIndex,
+    source,
+    code,
+    type,
+    uri
+  } = diagnostic;
+  return {
+    message: message || '',
+    rowIndex: rowIndex || 0,
+    columnIndex: columnIndex || 0,
+    uri,
+    relativePath: '',
+    count: 0,
+    source: source || '',
+    code: code || '',
+    type: type || 'error',
+    listItemType: Item,
+    posInSet: index,
+    setSize: 1,
+    level: 2,
+    fileName: ''
+  };
+};
+const getRelativeParentUri = (uri, workspaceUri) => {
+  const slashIndex = uri.lastIndexOf('/');
+  return uri.slice(0, slashIndex).slice(workspaceUri.length);
+};
+const getFileName = uri => {
+  const slashIndex = uri.lastIndexOf('/');
+  return uri.slice(slashIndex + 1);
+};
+const toProblems = (diagnostics, workspaceUri = '') => {
+  const problems = [];
+  let problem = {
+    message: '',
+    rowIndex: 0,
+    columnIndex: 0,
+    uri: '',
+    relativePath: '',
+    count: 0,
+    source: '',
+    code: '',
+    level: 0,
+    listItemType: 0,
+    posInSet: 0,
+    setSize: 0,
+    type: '',
+    fileName: ''
+  };
+  let relativeIndex = 0;
+  for (const diagnostic of diagnostics) {
+    if (diagnostic.uri === problem.uri) {
+      relativeIndex++;
+      problem.count++;
+    } else {
+      relativeIndex = 1;
+      problem = {
+        message: '',
+        rowIndex: 0,
+        columnIndex: 0,
+        uri: diagnostic.uri,
+        relativePath: '',
+        count: 1,
+        source: '',
+        type: '',
+        listItemType: Expanded,
+        posInSet: relativeIndex,
+        setSize: 123,
+        level: 1,
+        code: '',
+        fileName: ''
+      };
+      problems.push(problem);
+    }
+    problems.push(toProblem(diagnostic, relativeIndex));
+  }
+  for (const problem of problems) {
+    // TODO maybe rename property, this should be the relative path of the parent folder of the file
+    // @ts-ignore
+    problem.relativePath = getRelativeParentUri(problem.uri, workspaceUri);
+    // @ts-ignore
+    problem.fileName = getFileName(problem.uri);
+    // problem.uri = problem.uri // TODO
+  }
+  return problems;
+};
+
+// TODO send event listener to editor, asking to send problem updates to this worker
+
+const getProblems = async workspaceUri => {
+  try {
+    // @ts-ignore
+    const diagnostics = await invoke('Editor.getProblems');
+    // @ts-ignore
+    const problems = toProblems(diagnostics, workspaceUri);
+    return {
+      problems,
+      error: ''
+    };
+  } catch (error) {
+    return {
+      problems: [],
+      error: `${error}`
+    };
+  }
 };
 
 const emptyObject = {};
@@ -1440,7 +1714,16 @@ const getSavedCollapsedUris = savedState => {
   return [];
 };
 const loadContent = async (state, savedState) => {
-  const problems = await getProblems();
+  const {
+    problems,
+    error
+  } = await getProblems(state.workspaceUri);
+  if (error) {
+    return {
+      ...state,
+      message: error
+    };
+  }
   const message = getMessage(problems.length);
   const viewMode = getSavedViewMode(savedState);
   const filterValue = getSavedFilterValue(savedState);
@@ -1576,6 +1859,22 @@ const getProblemsFilterVirtualDom = action => {
   })];
 };
 
+const getNoResultsWithFilterVirtualDom = () => {
+  return [{
+    type: VirtualDomElements.Div,
+    className: Message,
+    childCount: 3
+  }, {
+    type: VirtualDomElements.Span,
+    childCount: 1
+  }, text(noResultsFoundWithProvidedFilterCriteria()), {
+    type: VirtualDomElements.A,
+    className: MessageAction,
+    childCount: 1,
+    onClick: HandleClearFilterClick
+  }, text(clearFilter()), text('.')];
+};
+
 const getBadgeVirtualDom = (className, count) => {
   return [{
     type: VirtualDomElements.Div,
@@ -1647,23 +1946,23 @@ const getTreeItemIndent = depth => {
 
 const getProblemVirtualDom = problem => {
   const {
-    message,
-    rowIndex,
+    code,
     columnIndex,
-    isActive,
-    uri,
+    filterValueLength,
     icon,
-    source,
-    relativePath,
+    isActive,
+    isCollapsed,
+    level,
+    listItemType,
+    message,
     messageMatchIndex,
-    filterValueLength,
-    code,
-    type,
     posInSet,
+    relativePath,
+    rowIndex,
     setSize,
-    level,
-    listItemType,
-    isCollapsed
+    source,
+    type,
+    fileName
   } = problem;
   let className = Problem;
   if (isActive) {
@@ -1681,7 +1980,7 @@ const getProblemVirtualDom = problem => {
       ariaExpanded: !isCollapsed,
       ariaSelected: isActive,
       role: AriaRoles.TreeItem
-    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), text(uri), {
+    }, listItemType === Collapsed ? getChevronRightVirtualDom() : getChevronDownVirtualDom(), getFileIconVirtualDom(icon), text(fileName), {
       type: VirtualDomElements.Div,
       className: LabelDetail,
       childCount: 1
@@ -1739,29 +2038,12 @@ const getProblemsListVirtualDom = problems => {
   return dom;
 };
 
-const getProblemsNoProblemsFoundVirtualDom = filterValue => {
-  // TODO avoid mutation
-  const dom = [];
-  dom.push({
+const getProblemsNoProblemsFoundVirtualDom = () => {
+  return [{
     type: VirtualDomElements.Div,
     className: Message,
     childCount: 1
-  });
-  if (filterValue) {
-    dom[0].childCount += 2;
-    dom.push({
-      type: VirtualDomElements.Span,
-      childCount: 1
-    }, text(noResultsFoundWithProvidedFilterCriteria()), {
-      type: VirtualDomElements.A,
-      className: MessageAction,
-      childCount: 1,
-      onClick: HandleClearFilterClick
-    }, text(clearFilter()), text('.'));
-  } else {
-    dom.push(text(noProblemsDetected()));
-  }
-  return dom;
+  }, text(noProblemsDetected())];
 };
 
 const getClassName = isEven => {
@@ -1867,9 +2149,19 @@ const getProblemsTableVirtualDom = problems => {
   return dom;
 };
 
-const getProblemsVirtualDom$1 = (viewMode, problems, filterValue) => {
+const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message) => {
+  if (problems.length === 0 && message) {
+    return [{
+      type: VirtualDomElements.Div,
+      className: Message,
+      childCount: 1
+    }, text(message)];
+  }
+  if (problems.length === 0 && filterValue) {
+    return getNoResultsWithFilterVirtualDom();
+  }
   if (problems.length === 0) {
-    return getProblemsNoProblemsFoundVirtualDom(filterValue);
+    return getProblemsNoProblemsFoundVirtualDom();
   }
   if (viewMode === Table) {
     return getProblemsTableVirtualDom(problems);
@@ -1877,7 +2169,7 @@ const getProblemsVirtualDom$1 = (viewMode, problems, filterValue) => {
   return getProblemsListVirtualDom(problems);
 };
 
-const getProblemsVirtualDom = (viewMode, problems, filterValue, isSmall) => {
+const getProblemsVirtualDom = (viewMode, problems, filterValue, isSmall, message) => {
   // TODO avoid mutation
   const dom = [];
   dom.push({
@@ -1896,7 +2188,7 @@ const getProblemsVirtualDom = (viewMode, problems, filterValue, isSmall) => {
       badgeText: '',
       placeholder: filter()}));
   }
-  dom.push(...getProblemsVirtualDom$1(viewMode, problems, filterValue));
+  dom.push(...getProblemsVirtualDom$1(viewMode, problems, filterValue, message));
   return dom;
 };
 
@@ -1973,9 +2265,19 @@ const getVisibleProblems = (problems, collapsedUris, focusedIndex, filterValue)
 };
 
 const renderItems = (oldState, newState) => {
-  const visible = getVisibleProblems(newState.problems, newState.collapsedUris, newState.focusedIndex, newState.filterValue);
-  const isSmall = newState.width <= newState.smallWidthBreakPoint;
-  const dom = getProblemsVirtualDom(newState.viewMode, visible, newState.filterValue, isSmall);
+  const {
+    problems,
+    width,
+    smallWidthBreakPoint,
+    collapsedUris,
+    focusedIndex,
+    viewMode,
+    filterValue,
+    message
+  } = newState;
+  const visible = getVisibleProblems(problems, collapsedUris, focusedIndex, filterValue);
+  const isSmall = width <= smallWidthBreakPoint;
+  const dom = getProblemsVirtualDom(viewMode, visible, filterValue, isSmall, message);
   return ['Viewlet.setDom2', dom];
 };
 
@@ -2004,7 +2306,7 @@ const render2 = (uid, diffResult) => {
     oldState,
     newState
   } = get(uid);
-  set(uid, newState, newState);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2142,18 +2444,19 @@ const viewAsTable = state => {
 };
 
 const commandMap = {
-  'Problems.copyMessage': copyMessage,
+  'Problems.copyMessage': wrapCommand(copyMessage),
   'Problems.create': create,
   'Problems.diff2': diff2,
-  'Problems.focusIndex': focusIndex,
+  'Problems.focusIndex': wrapCommand(focusIndex),
   'Problems.getCommandIds': getCommandIds,
   'Problems.getKeyBindings': getKeyBindings,
   'Problems.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Problems.handleArrowRight': wrapCommand(handleArrowRight),
   'Problems.handleClickAt': wrapCommand(handleClickAt),
-  'Problems.handleContextMenu': handleContextMenu,
+  'Problems.handleContextMenu': wrapCommand(handleContextMenu),
+  'Problems.handleClickButton': wrapCommand(handleClickButton),
   'Problems.handleFilterInput': wrapCommand(handleFilterInput),
-  'Problems.handleIconThemeChange': handleIconThemeChange,
+  'Problems.handleIconThemeChange': wrapCommand(handleIconThemeChange),
   'Problems.initialize': initialize,
   'Problems.loadContent': wrapCommand(loadContent),
   'Problems.render2': render2,
@@ -2162,8 +2465,8 @@ const commandMap = {
   'Problems.resize': resize,
   'Problems.saveState': saveState,
   'Problems.terminate': terminate,
-  'Problems.viewAsList': viewAsList,
-  'Problems.viewAsTable': viewAsTable
+  'Problems.viewAsList': wrapCommand(viewAsList),
+  'Problems.viewAsTable': wrapCommand(viewAsTable)
 };
 
 const listen = async () => {
@@ -2171,7 +2474,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMapRef
   });
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/problems-view",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "Problems View Worker",
   "repository": {
     "type": "git",