@lvce-editor/problems-view 1.35.0 → 1.37.0

package/dist/problemsViewWorkerMain.js

@@ -6,7 +6,8 @@ const create$a = () => {
   const commandQueues = new Map();
   const generations = Object.create(null);
   const states = Object.create(null);
-  const commandMapRef = {};
+  const commandMapRef = Object.create(null);
+  const commandsById = Object.create(null);
   const getGeneration = uid => generations[uid] || 0;
   const isCurrentGeneration = (uid, generation) => {
     return states[uid] !== undefined && getGeneration(uid) === generation;
@@ -68,6 +69,18 @@ const create$a = () => {
         delete states[key];
       }
     },
+    createDirectEventCommandMap(requestRender) {
+      return {
+        async 'Viewlet.executeViewletCommand'(uid, command, ...args) {
+          const fn = commandsById[command];
+          if (!fn) {
+            throw new Error(`Viewlet command not found: ${command}`);
+          }
+          await fn(uid, ...args);
+          await requestRender(uid);
+        }
+      };
+    },
     diff(uid, modules, numbers) {
       const {
         oldState,
@@ -99,6 +112,9 @@ const create$a = () => {
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
+      for (const [key, fn] of Object.entries(commandMap)) {
+        commandsById[toCommandId(key)] = fn;
+      }
     },
     set(uid, oldState, newState, scheduledState) {
       const current = states[uid];
@@ -1437,179 +1453,18 @@ const create$1 = rpcId => {
   };
 };
 
-const None$1 = 'none';
+const None$2 = 'none';
 const ToolBar = 'toolbar';
 const Tree = 'tree';
 const TreeItem = 'treeitem';
 
-const Audio = 0;
 const Button$1 = 1;
-const Col = 2;
-const ColGroup = 3;
 const Div = 4;
-const H1 = 5;
 const Input = 6;
-const Kbd = 7;
 const Span = 8;
-const Table$1 = 9;
-const TBody = 10;
-const Td = 11;
 const Text = 12;
-const Th = 13;
-const THead = 14;
-const Tr = 15;
-const I = 16;
 const Img = 17;
-const Root = 0;
-const Ins = 20;
-const Del = 21;
-const H2 = 22;
-const H3 = 23;
-const H4 = 24;
-const H5 = 25;
-const H6 = 26;
-const Article = 27;
-const Aside = 28;
-const Footer = 29;
-const Header = 30;
-const Nav = 40;
-const Section = 41;
-const Search = 42;
-const Dd = 43;
-const Dl = 44;
-const Figcaption = 45;
-const Figure = 46;
-const Hr = 47;
-const Li = 48;
-const Ol = 49;
-const P = 50;
-const Pre = 51;
 const A = 53;
-const Abbr = 54;
-const Br = 55;
-const Cite = 56;
-const Data = 57;
-const Time = 58;
-const Tfoot = 59;
-const Ul = 60;
-const Video = 61;
-const TextArea = 62;
-const Select = 63;
-const Option = 64;
-const Code$1 = 65;
-const Label$1 = 66;
-const Dt = 67;
-const Iframe = 68;
-const Main = 69;
-const Strong = 70;
-const Em = 71;
-const Style = 72;
-const Html = 73;
-const Head = 74;
-const Title = 75;
-const Meta = 76;
-const Canvas = 77;
-const Form = 78;
-const BlockQuote = 79;
-const Quote = 80;
-const Circle = 81;
-const Defs = 82;
-const Ellipse = 83;
-const G = 84;
-const Line = 85;
-const Path = 86;
-const Polygon = 87;
-const Polyline = 88;
-const Rect = 89;
-const Svg = 90;
-const Use = 91;
-const Reference = 100;
-
-const VirtualDomElements = {
-  __proto__: null,
-  A,
-  Abbr,
-  Article,
-  Aside,
-  Audio,
-  BlockQuote,
-  Br,
-  Button: Button$1,
-  Canvas,
-  Circle,
-  Cite,
-  Code: Code$1,
-  Col,
-  ColGroup,
-  Data,
-  Dd,
-  Defs,
-  Del,
-  Div,
-  Dl,
-  Dt,
-  Ellipse,
-  Em,
-  Figcaption,
-  Figure,
-  Footer,
-  Form,
-  G,
-  H1,
-  H2,
-  H3,
-  H4,
-  H5,
-  H6,
-  Head,
-  Header,
-  Hr,
-  Html,
-  I,
-  Iframe,
-  Img,
-  Input,
-  Ins,
-  Kbd,
-  Label: Label$1,
-  Li,
-  Line,
-  Main,
-  Meta,
-  Nav,
-  Ol,
-  Option,
-  P,
-  Path,
-  Polygon,
-  Polyline,
-  Pre,
-  Quote,
-  Rect,
-  Reference,
-  Root,
-  Search,
-  Section,
-  Select,
-  Span,
-  Strong,
-  Style,
-  Svg,
-  TBody,
-  THead,
-  Table: Table$1,
-  Td,
-  Text,
-  TextArea,
-  Tfoot,
-  Th,
-  Time,
-  Title,
-  Tr,
-  Ul,
-  Use,
-  Video
-};
 
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
@@ -1749,7 +1604,7 @@ const {
   wrapGetter
 } = create$a();
 
-const None = 0;
+const None$1 = 0;
 const Table = 1;
 const List = 2;
 
@@ -1780,7 +1635,7 @@ const create = (id, uri, x, y, width, height, workspaceUri) => {
     showWarnings: true,
     smallWidthBreakPoint: 650,
     uid: id,
-    viewMode: None,
+    viewMode: None$1,
     width,
     workspaceUri,
     x,
@@ -1833,7 +1688,7 @@ const diff = (oldState, newState) => {
 const FilterHeight = 24;
 const TableHeaderHeight = 22;
 const getListTopOffset = (width, smallWidthBreakPoint, viewMode) => {
-  const filterHeight = viewMode !== None && width <= smallWidthBreakPoint ? FilterHeight : 0;
+  const filterHeight = viewMode !== None$1 && width <= smallWidthBreakPoint ? FilterHeight : 0;
   const tableHeaderHeight = viewMode === Table ? TableHeaderHeight : 0;
   return filterHeight + tableHeaderHeight;
 };
@@ -1855,9 +1710,6 @@ const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   return Math.min(Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize), size);
 };
 
-const Error$1 = 'error';
-const Warning = 'warning';
-
 const getListItemType = (listItemType, isCollapsed) => {
   if (listItemType === Item) {
     return Item;
@@ -1875,11 +1727,18 @@ const matchesFilterValue = (string, filterValueLower) => {
   return 0;
 };
 
+const None = 0;
+const Error$2 = 1;
+const Warning$1 = 2;
+const Spelling = 3;
+const Info = 4;
+const Other = 5;
+
 const matchesSeverity = (problem, showErrors, showWarnings, showInfos) => {
   switch (problem.type) {
-    case Error$1:
+    case Error$2:
       return showErrors;
-    case Warning:
+    case Warning$1:
       return showWarnings;
     default:
       return showInfos;
@@ -2006,8 +1865,6 @@ const text = data => {
   };
 };
 
-new Set(Object.values(VirtualDomElements));
-
 const FocusProblems = 19;
 
 const getKeyBindings = () => {
@@ -2189,6 +2046,9 @@ const getMenuIds = () => {
   return [ProblemsFilter$1];
 };
 
+const Error$1 = 'error';
+const Warning = 'warning';
+
 const {
   getProblems: getProblems$1,
   getUri} = EditorWorker;
@@ -2196,9 +2056,21 @@ const getDiagnostics = editorId => {
   return invoke$3('Editor.getDiagnostics', editorId);
 };
 
-const leadingSlashesRegex = /^\/+/;
-const trailingSlashRegex = /\/$/;
-const windowsDrivePathRegex = /^\/[a-z]:\//i;
+const getProblemType = type => {
+  switch (type) {
+    case Error$1:
+      return Error$2;
+    case Warning:
+      return Warning$1;
+    case 'info':
+      return Info;
+    case 'spelling':
+      return Spelling;
+    default:
+      return type ? Other : Error$2;
+  }
+};
+
 const toProblem = (diagnostic, index) => {
   const {
     code,
@@ -2218,31 +2090,13 @@ const toProblem = (diagnostic, index) => {
     listItemType: Item,
     message: message || '',
     posInSet: index,
-    relativePath: '',
     rowIndex: rowIndex || 0,
     setSize: 1,
     source: source || '',
-    type: type || 'error',
+    type: getProblemType(type),
     uri
   };
 };
-const normalizeFileUri = uri => {
-  const normalizedUri = uri.startsWith('file://') ? uri.slice('file://'.length) : uri;
-  return windowsDrivePathRegex.test(normalizedUri) ? normalizedUri.slice(1) : normalizedUri;
-};
-const getRelativeParentUri = (uri, workspaceUri) => {
-  const normalizedUri = normalizeFileUri(uri);
-  const normalizedWorkspaceUri = normalizeFileUri(workspaceUri).replace(trailingSlashRegex, '');
-  const slashIndex = normalizedUri.lastIndexOf('/');
-  const parentUri = normalizedUri.slice(0, slashIndex);
-  if (parentUri === normalizedWorkspaceUri) {
-    return '';
-  }
-  if (normalizedWorkspaceUri && parentUri.startsWith(`${normalizedWorkspaceUri}/`)) {
-    return parentUri.slice(normalizedWorkspaceUri.length + 1);
-  }
-  return parentUri.replace(leadingSlashesRegex, '');
-};
 const getFileName = uri => {
   const slashIndex = uri.lastIndexOf('/');
   return uri.slice(slashIndex + 1);
@@ -2257,16 +2111,15 @@ const toRelatedProblem = (relatedInformation, diagnostic, index, setSize) => {
     listItemType: Item,
     message: relatedInformation.message || '',
     posInSet: index,
-    relativePath: '',
     rowIndex: relatedInformation.rowIndex || 0,
     setSize,
     source: getFileName(relatedInformation.uri),
     targetUri: relatedInformation.uri,
-    type: diagnostic.type || 'error',
+    type: getProblemType(diagnostic.type),
     uri: diagnostic.uri
   };
 };
-const toProblems = (diagnostics, workspaceUri = '') => {
+const toProblems = diagnostics => {
   const problems = [];
   let problem = {
     code: '',
@@ -2277,11 +2130,10 @@ const toProblems = (diagnostics, workspaceUri = '') => {
     listItemType: 0,
     message: '',
     posInSet: 0,
-    relativePath: '',
     rowIndex: 0,
     setSize: 0,
     source: '',
-    type: '',
+    type: None,
     uri: ''
   };
   let relativeIndex = 0;
@@ -2300,11 +2152,10 @@ const toProblems = (diagnostics, workspaceUri = '') => {
         listItemType: Expanded,
         message: '',
         posInSet: relativeIndex,
-        relativePath: '',
         rowIndex: 0,
         setSize: 123,
         source: '',
-        type: '',
+        type: None,
         uri: diagnostic.uri
       };
       problems.push(problem);
@@ -2316,13 +2167,8 @@ const toProblems = (diagnostics, workspaceUri = '') => {
     }
   }
   for (const problem of problems) {
-    // TODO maybe rename property, this should be the relative path of the parent folder of the file
-    // @ts-ignore
     const displayUri = problem.targetUri || problem.uri;
-    problem.relativePath = getRelativeParentUri(displayUri, workspaceUri);
-    // @ts-ignore
     problem.fileName = getFileName(displayUri);
-    // problem.uri = problem.uri // TODO
   }
   return problems;
 };
@@ -2339,7 +2185,7 @@ const getUniqueDiagnostics = diagnostics => {
     return true;
   });
 };
-const getProblems = async (workspaceUri, activeUri) => {
+const getProblems = async activeUri => {
   if (!activeUri) {
     return {
       error: '',
@@ -2348,7 +2194,7 @@ const getProblems = async (workspaceUri, activeUri) => {
   }
   try {
     const diagnostics = getUniqueDiagnostics(await getProblems$1());
-    const problems = toProblems(diagnostics, workspaceUri);
+    const problems = toProblems(diagnostics);
     return {
       error: '',
       problems
@@ -2436,13 +2282,12 @@ const getFileIcons = async (problems, fileIconCache) => {
 
 const refreshProblems = async (state, activeUri) => {
   const {
-    fileIconCache,
-    workspaceUri
+    fileIconCache
   } = state;
   const {
     error,
     problems
-  } = await getProblems(workspaceUri, activeUri);
+  } = await getProblems(activeUri);
   const newFileIconCache = await getFileIcons(problems, fileIconCache);
   return {
     ...state,
@@ -2938,7 +2783,7 @@ const loadContent = async (state, savedState) => {
   const {
     error,
     problems
-  } = await getProblems(workspaceUri, activeUri);
+  } = await getProblems(activeUri);
   if (error) {
     return {
       ...state,
@@ -3136,7 +2981,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
     className: mergeClassNames('MaskIcon', `MaskIcon${icon}`),
-    role: None$1,
+    role: None$2,
     type
   };
 };
@@ -3274,7 +3119,7 @@ const getFileIconVirtualDom = icon => {
     alt: '',
     childCount: 0,
     className: FileIcon,
-    role: None$1,
+    role: None$2,
     src: icon,
     type: Img
   };
@@ -3291,7 +3136,7 @@ const errorIconNode = {
   type: Div
 };
 const getProblemsIconVirtualDom = type => {
-  if (type === Warning) {
+  if (type === Warning$1) {
     return warningIconNode;
   }
   return errorIconNode;
@@ -3310,6 +3155,34 @@ const getProblemSourceDetail = (source, code) => {
   return message;
 };
 
+const leadingSlashesRegex = /^\/+/;
+const trailingSlashRegex = /\/$/;
+const schemeRootRegex = /^[a-z][a-z\d+.-]*:\/\/$/i;
+const windowsDrivePathRegex = /^\/[a-z]:\//i;
+const normalizeFileUri = uri => {
+  const normalizedUri = uri.startsWith('file://') ? uri.slice('file://'.length) : uri;
+  return windowsDrivePathRegex.test(normalizedUri) ? normalizedUri.slice(1) : normalizedUri;
+};
+const getRelativeParentUri = (uri, workspaceUri) => {
+  const normalizedUri = normalizeFileUri(uri);
+  const normalizedWorkspaceUri = normalizeFileUri(workspaceUri).replace(trailingSlashRegex, '');
+  const slashIndex = normalizedUri.lastIndexOf('/');
+  if (slashIndex === -1) {
+    return '';
+  }
+  const parentUri = normalizedUri.slice(0, slashIndex);
+  if (schemeRootRegex.test(parentUri)) {
+    return '';
+  }
+  if (parentUri === normalizedWorkspaceUri) {
+    return '';
+  }
+  if (normalizedWorkspaceUri && parentUri.startsWith(`${normalizedWorkspaceUri}/`)) {
+    return parentUri.slice(normalizedWorkspaceUri.length + 1);
+  }
+  return parentUri.replace(leadingSlashesRegex, '');
+};
+
 const labelNode = {
   childCount: 1,
   className: Label,
@@ -3330,7 +3203,7 @@ const problemAtNode = {
   className: ProblemAt,
   type: Span
 };
-const getProblemVirtualDom = problem => {
+const getProblemVirtualDom = (problem, workspaceUri = '') => {
   const {
     code,
     columnIndex,
@@ -3344,7 +3217,6 @@ const getProblemVirtualDom = problem => {
     message,
     messageMatchIndex,
     posInSet,
-    relativePath,
     rowIndex,
     setSize,
     source,
@@ -3373,7 +3245,7 @@ const getProblemVirtualDom = problem => {
       ...labelNode,
       'data-uri': uri,
       onClick: HandleFileNameClick
-    }, text(fileName), labelDetailNode, text(relativePath), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
+    }, text(fileName), labelDetailNode, text(getRelativeParentUri(uri, workspaceUri)), ...getBadgeVirtualDom(ProblemBadge, problem.count)];
   }
   const lineColumn = atLineColumn(rowIndex + 1, columnIndex + 1);
   const label = {
@@ -3407,7 +3279,7 @@ const getProblemVirtualDom = problem => {
   return dom;
 };
 
-const getProblemsListVirtualDom = problems => {
+const getProblemsListVirtualDom = (problems, workspaceUri = '') => {
   const dom = [{
     ariaLabel: 'Problems Tree',
     // TODO use i18n string
@@ -3415,7 +3287,7 @@ const getProblemsListVirtualDom = problems => {
     className: ProblemsList,
     role: Tree,
     type: Div
-  }, ...problems.flatMap(getProblemVirtualDom)];
+  }, ...problems.flatMap(problem => getProblemVirtualDom(problem, workspaceUri))];
   return dom;
 };
 
@@ -3514,7 +3386,7 @@ const messageNode = {
   className: Message,
   type: Div
 };
-const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message, problemCount = problems.length) => {
+const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message, problemCount = problems.length, workspaceUri = '') => {
   if (problemCount === 0 && message) {
     return [messageNode, text(message)];
   }
@@ -3527,7 +3399,7 @@ const getProblemsVirtualDom$1 = (viewMode, problems, filterValue, message, probl
   if (viewMode === Table) {
     return getProblemsTableVirtualDom(problems);
   }
-  return getProblemsListVirtualDom(problems);
+  return getProblemsListVirtualDom(problems, workspaceUri);
 };
 
 const scrollBarNode = {
@@ -3549,7 +3421,7 @@ const getScrollBarVirtualDom = (scrollBarHeight, scrollBarActive) => {
 
 const Focusable = 0;
 
-const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, inputSource, isSmall, message, scrollBarHeight = 0, scrollBarActive = false, problemCount = problems.length) => {
+const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, inputSource, isSmall, message, scrollBarHeight = 0, scrollBarActive = false, problemCount = problems.length, workspaceUri = '') => {
   const baseDom = {
     childCount: isSmall ? 2 : 1,
     className: mergeClassNames(Viewlet, Problems),
@@ -3568,7 +3440,7 @@ const getProblemsVirtualDom = (activeUri, viewMode, problems, filterValue, input
     placeholder: filter(),
     value: filterValue
   }) : [];
-  const itemsDom = getProblemsVirtualDom$1(viewMode, problems, filterValue, message, problemCount);
+  const itemsDom = getProblemsVirtualDom$1(viewMode, problems, filterValue, message, problemCount, workspaceUri);
   const scrollBarDom = getScrollBarVirtualDom(scrollBarHeight, scrollBarActive);
   const contentClassName = viewMode === Table ? mergeClassNames(ProblemsContent, ProblemsContentTable) : ProblemsContent;
   const contentDom = {
@@ -3598,12 +3470,13 @@ const renderItems = (oldState, newState) => {
     showWarnings,
     smallWidthBreakPoint,
     viewMode,
-    width
+    width,
+    workspaceUri
   } = newState;
   const problemCount = getVisibleProblemCount(problems, collapsedUris, filterValue, viewMode, showErrors, showWarnings, showInfos);
   const visible = getVisibleProblems(problems, fileIconCache, collapsedUris, focusedIndex, filterValue, minLineY, maxLineY, viewMode, showErrors, showWarnings, showInfos);
   const isSmall = width <= smallWidthBreakPoint;
-  const dom = getProblemsVirtualDom(activeUri, viewMode, visible, filterValue, inputSource, isSmall, message, scrollBarHeight, scrollBarActive, problemCount);
+  const dom = getProblemsVirtualDom(activeUri, viewMode, visible, filterValue, inputSource, isSmall, message, scrollBarHeight, scrollBarActive, problemCount, workspaceUri);
   return ['Viewlet.setDom2', newState.uid, dom];
 };
 

package/package.json

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