@lvce-editor/problems-view 1.15.0 → 1.17.0

package/dist/problemsViewWorkerMain.js

@@ -1,3 +1,121 @@
+const toCommandId = key => {
+  const dotIndex = key.indexOf('.');
+  return key.slice(dotIndex + 1);
+};
+const create$6 = () => {
+  const states = Object.create(null);
+  const commandMapRef = {};
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          oldState,
+          newState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (oldState === newerState || newState === newerState) {
+          return;
+        }
+        const latest = states[uid];
+        states[uid] = {
+          oldState: latest.oldState,
+          newState: newerState
+        };
+      };
+      return wrapped;
+    },
+    wrapGetter(fn) {
+      const wrapped = (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        return fn(newState, ...args);
+      };
+      return wrapped;
+    },
+    diff(uid, modules, numbers) {
+      const {
+        oldState,
+        newState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    }
+  };
+};
+const terminate = () => {
+  globalThis.close();
+};
+
+const None$2 = 'none';
+const ToolBar = 'toolbar';
+const Tree = 'tree';
+const TreeItem = 'treeitem';
+
+const Button$1 = 1;
+const Div = 4;
+const Input = 6;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const A = 53;
+
+const Space = 9;
+const PageUp = 10;
+const PageDown = 11;
+const End = 255;
+const Home = 12;
+const LeftArrow = 13;
+const UpArrow = 14;
+const RightArrow = 15;
+const DownArrow = 16;
+
+const Script$1 = 2;
+
+const ProblemsFilter$1 = 25;
+
+const None$1 = 0;
+
+const DebugWorker = 55;
+const EditorWorker$1 = 99;
+const RendererWorker$1 = 1;
+
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -969,6 +1087,53 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+
+/* eslint-disable @typescript-eslint/no-misused-promises */
+
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+const create$i = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$2({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
+};
+const LazyTransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$i
+};
 const create$4 = async ({
   commandMap,
   isMessagePortOpen = true,
@@ -986,7 +1151,7 @@ const create$4 = async ({
   messagePort.start();
   return rpc;
 };
-const create$2$1 = async ({
+const create$2 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -1002,10 +1167,6 @@ const create$2$1 = async ({
     messagePort: port2
   });
 };
-const TransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$2$1
-};
 const create$1$1 = async ({
   commandMap
 }) => {
@@ -1040,125 +1201,8 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const toCommandId$1 = key => {
-  const dotIndex = key.indexOf('.');
-  return key.slice(dotIndex + 1);
-};
-const create$2 = () => {
-  const states = Object.create(null);
-  const commandMapRef = {};
-  return {
-    get(uid) {
-      return states[uid];
-    },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
-    },
-    dispose(uid) {
-      delete states[uid];
-    },
-    getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseInt(key);
-      });
-    },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
-    },
-    wrapCommand(fn) {
-      const wrapped = async (uid, ...args) => {
-        const {
-          oldState,
-          newState
-        } = states[uid];
-        const newerState = await fn(newState, ...args);
-        if (oldState === newerState || newState === newerState) {
-          return;
-        }
-        const latest = states[uid];
-        states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
-        };
-      };
-      return wrapped;
-    },
-    wrapGetter(fn) {
-      const wrapped = (uid, ...args) => {
-        const {
-          newState
-        } = states[uid];
-        return fn(newState, ...args);
-      };
-      return wrapped;
-    },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
-        }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId$1);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
-    }
-  };
-};
-const terminate = () => {
-  globalThis.close();
-};
-
-const None$1 = 'none';
-const ToolBar = 'toolbar';
-const Tree = 'tree';
-const TreeItem = 'treeitem';
-
-const Button$1 = 1;
-const Div = 4;
-const Input = 6;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const A = 53;
-
-const Space = 9;
-const PageUp = 10;
-const PageDown = 11;
-const End = 255;
-const Home = 12;
-const LeftArrow = 13;
-const UpArrow = 14;
-const RightArrow = 15;
-const DownArrow = 16;
-
-const Script$1 = 2;
-
-const ManageExtension = 8;
-const ProblemsFilter$1 = 25;
-
-const DebugWorker = 55;
-const EditorWorker$1 = 99;
-const RendererWorker$1 = 1;
-
 const rpcs = Object.create(null);
-const set$5 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1191,7 +1235,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$5(rpcId, mockRpc);
+      set$4(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1200,7 +1244,7 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$5(rpcId, rpc);
+      set$4(rpcId, rpc);
     }
   };
 };
@@ -1210,7 +1254,7 @@ const {
   invoke: invoke$1,
   invokeAndTransfer: invokeAndTransfer$1,
   registerMockRpc: registerMockRpc$1,
-  set: set$4
+  set: set$3
 } = create$1(EditorWorker$1);
 const sendMessagePortToExtensionHostWorker$1 = async port => {
   const command = 'HandleMessagePort.handleMessagePort2';
@@ -1308,7 +1352,7 @@ const EditorWorker = {
   invokeAndTransfer: invokeAndTransfer$1,
   registerMockRpc: registerMockRpc$1,
   sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1,
-  set: set$4,
+  set: set$3,
   updateDebugInfo
 };
 
@@ -1317,7 +1361,7 @@ const {
   invoke,
   invokeAndTransfer,
   registerMockRpc,
-  set: set$3
+  set: set$2
 } = create$1(RendererWorker$1);
 const searchFileHtml = async uri => {
   return invoke('ExtensionHost.searchFileWithHtml', uri);
@@ -1728,7 +1772,7 @@ const RendererWorker = {
   sendMessagePortToSourceControlWorker,
   sendMessagePortToSyntaxHighlightingWorker,
   sendMessagePortToTextMeasurementWorker,
-  set: set$3,
+  set: set$2,
   setAdditionalFocus,
   setColorTheme,
   setExtensionsSearchValue,
@@ -1749,7 +1793,7 @@ const RendererWorker = {
 
 const {
   sendMessagePortToEditorWorker,
-  set: set$2,
+  set: set$1,
   writeClipBoardText
 } = RendererWorker;
 
@@ -1772,9 +1816,12 @@ const Script = 2;
 
 const {
   get,
-  set: set$1,
-  wrapCommand
-} = create$2();
+  getCommandIds,
+  registerCommands,
+  set,
+  wrapCommand,
+  wrapGetter
+} = create$6();
 
 const None = 0;
 const Table = 1;
@@ -1802,7 +1849,7 @@ const create = (id, uri, x, y, width, height, workspaceUri) => {
     x,
     y
   };
-  set$1(id, state, state);
+  set(id, state, state);
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -1846,18 +1893,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 mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -1920,8 +1955,128 @@ const getKeyBindings = () => {
   }];
 };
 
+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 ClearFilters = 'Clear Filters';
+const Code = 'Code';
+const File = 'File';
+const Filter$3 = 'Filter';
+const LineColumn = '[Ln {PH1}, Col {PH2}]';
+const Message$1 = 'Message';
+const NoProblemsDetected = 'No problems have been detected in the workspace.';
+const NoResultsFoundWithProvidedFilterCriteria = 'No results found with provided filter criteria.';
+const ProblemsDetected = 'Some problems have been detected in the workspace.';
+const ShowingOfItems = 'Showing {PH1} of {PH2} ';
+const Source = 'Source';
+const CollapseAll$1 = 'Collapse All';
+const ViewAsTable = 'View as Table';
+const ViewAsList = 'View as List';
+const ShowErrors = 'Show Errors';
+const ShowWarnings = 'Show Warnings';
+const ShowInfos = 'Show Infos';
+
+const noProblemsDetected = () => {
+  return i18nString(NoProblemsDetected);
+};
+const getMessage = problemsCount => {
+  if (problemsCount === 0) {
+    return i18nString(NoProblemsDetected);
+  }
+  return i18nString(ProblemsDetected);
+};
+const atLineColumn = (line, column) => {
+  return i18nString(LineColumn, {
+    PH1: line,
+    PH2: column
+  });
+};
+const clearFilter = () => {
+  return i18nString(ClearFilters);
+};
+const code = () => {
+  return i18nString(Code);
+};
+const message = () => {
+  return i18nString(Message$1);
+};
+const file = () => {
+  return i18nString(File);
+};
+const filter = () => {
+  return i18nString(Filter$3);
+};
+const showingOf = (visibleCount, totalCount) => {
+  return i18nString(ShowingOfItems, {
+    PH1: visibleCount,
+    PH2: totalCount
+  });
+};
+const source = () => {
+  return i18nString(Source);
+};
+const noResultsFoundWithProvidedFilterCriteria = () => {
+  return i18nString(NoResultsFoundWithProvidedFilterCriteria);
+};
+const collapseAll = () => {
+  return i18nString(CollapseAll$1);
+};
+const viewAsList$1 = () => {
+  return i18nString(ViewAsList);
+};
+const viewAsTable$1 = () => {
+  return i18nString(ViewAsTable);
+};
+const showErrors = () => {
+  return i18nString(ShowErrors);
+};
+const showWarnings = () => {
+  return i18nString(ShowWarnings);
+};
+const showInfos = () => {
+  return i18nString(ShowInfos);
+};
+
+const getMenuEntriesFilter = () => [{
+  command: '-1',
+  flags: None$1,
+  id: 'show-errors',
+  label: showErrors()
+}, {
+  command: '-1',
+  flags: None$1,
+  id: 'show-warnings',
+  label: showWarnings()
+}, {
+  command: '-1',
+  flags: None$1,
+  id: 'show-infos',
+  label: showInfos()
+}];
+
+const getMenuEntries2 = (state, props) => {
+  const {
+    menuId
+  } = props;
+  switch (menuId) {
+    case ProblemsFilter$1:
+      return getMenuEntriesFilter();
+    default:
+      return [];
+  }
+};
+
 const getMenuIds = () => {
-  return [ManageExtension, ProblemsFilter$1];
+  return [ProblemsFilter$1];
 };
 
 const Item = 0;
@@ -2065,30 +2220,12 @@ 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 initialize = async () => {
+  // function is not needed anymore
 };
 
 const {
-  getProblems: getProblems$1,
-  set
-} = EditorWorker;
-
-const initialize = async () => {
-  const rpc = await createEditorWorkerRpc();
-  set(rpc);
-};
+  getProblems: getProblems$1} = EditorWorker;
 
 const toProblem = (diagnostic, index) => {
   const {
@@ -2200,85 +2337,6 @@ const getProblems = async workspaceUri => {
   }
 };
 
-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 ClearFilters = 'Clear Filters';
-const Code = 'Code';
-const File = 'File';
-const Filter$3 = 'Filter';
-const LineColumn = '[Ln {PH1}, Col {PH2}]';
-const Message$1 = 'Message';
-const NoProblemsDetected = 'No problems have been detected in the workspace.';
-const NoResultsFoundWithProvidedFilterCriteria = 'No results found with provided filter criteria.';
-const ProblemsDetected = 'Some problems have been detected in the workspace.';
-const ShowingOfItems = 'Showing {PH1} of {PH2} ';
-const Source = 'Source';
-const CollapseAll$1 = 'Collapse All';
-const ViewAsTable = 'View as Table';
-const ViewAsList = 'View as List';
-
-const noProblemsDetected = () => {
-  return i18nString(NoProblemsDetected);
-};
-const getMessage = problemsCount => {
-  if (problemsCount === 0) {
-    return i18nString(NoProblemsDetected);
-  }
-  return i18nString(ProblemsDetected);
-};
-const atLineColumn = (line, column) => {
-  return i18nString(LineColumn, {
-    PH1: line,
-    PH2: column
-  });
-};
-const clearFilter = () => {
-  return i18nString(ClearFilters);
-};
-const code = () => {
-  return i18nString(Code);
-};
-const message = () => {
-  return i18nString(Message$1);
-};
-const file = () => {
-  return i18nString(File);
-};
-const filter = () => {
-  return i18nString(Filter$3);
-};
-const showingOf = (visibleCount, totalCount) => {
-  return i18nString(ShowingOfItems, {
-    PH1: visibleCount,
-    PH2: totalCount
-  });
-};
-const source = () => {
-  return i18nString(Source);
-};
-const noResultsFoundWithProvidedFilterCriteria = () => {
-  return i18nString(NoResultsFoundWithProvidedFilterCriteria);
-};
-const collapseAll = () => {
-  return i18nString(CollapseAll$1);
-};
-const viewAsList$1 = () => {
-  return i18nString(ViewAsList);
-};
-const viewAsTable$1 = () => {
-  return i18nString(ViewAsTable);
-};
-
 const getSavedViewMode = savedState => {
   if (savedState && typeof savedState.viewMode === 'number') {
     return savedState.viewMode;
@@ -2377,7 +2435,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
     className: mergeClassNames('MaskIcon', `MaskIcon${icon}`),
-    role: None$1,
+    role: None$2,
     type
   };
 };
@@ -2488,7 +2546,7 @@ const getFileIconVirtualDom = icon => {
   return {
     childCount: 0,
     className: FileIcon,
-    role: None$1,
+    role: None$2,
     src: icon,
     type: Img
   };
@@ -2892,7 +2950,7 @@ const render2 = (uid, diffResult) => {
     newState,
     oldState
   } = get(uid);
-  set$1(uid, newState, newState);
+  set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -3039,6 +3097,7 @@ const commandMap = {
   'Problems.focusIndex': wrapCommand(focusIndex),
   'Problems.getCommandIds': getCommandIds,
   'Problems.getKeyBindings': getKeyBindings,
+  'Problems.getMenuEntries2': wrapGetter(getMenuEntries2),
   'Problems.getMenuIds': getMenuIds,
   'Problems.handleArrowLeft': wrapCommand(handleArrowLeft),
   'Problems.handleArrowRight': wrapCommand(handleArrowRight),
@@ -3054,18 +3113,41 @@ const commandMap = {
   'Problems.renderActions': renderActions,
   'Problems.renderEventListeners': renderEventListeners,
   'Problems.resize': resize,
-  'Problems.saveState': saveState,
+  'Problems.saveState': wrapGetter(saveState),
   'Problems.terminate': terminate,
   'Problems.viewAsList': wrapCommand(viewAsList),
   'Problems.viewAsTable': wrapCommand(viewAsTable)
 };
 
-const listen = async () => {
-  Object.assign(commandMapRef, commandMap);
+const commandMapRef = {};
+
+const send = port => {
+  return sendMessagePortToEditorWorker(port, 0);
+};
+const initializeEditorWorkerRpc = async () => {
+  try {
+    const rpc = await LazyTransferMessagePortRpcParent.create({
+      commandMap: {},
+      send
+    });
+    set$3(rpc);
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create editor worker rpc`);
+  }
+};
+
+const initializeRendererWorker = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMapRef
   });
-  set$2(rpc);
+  set$1(rpc);
+};
+
+const listen = async () => {
+  Object.assign(commandMapRef, commandMap);
+  registerCommands(commandMap);
+  await Promise.all([initializeRendererWorker(), initializeEditorWorkerRpc()]);
 };
 
 const main = async () => {

package/package.json

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