@lvce-editor/output-view 2.12.0 → 2.13.0

package/dist/outputViewWorkerMain.js

@@ -1298,12 +1298,6 @@ const isFileNotFoundError = error => {
   return error?.message?.includes('File not found') ?? false;
 };
 
-const RE_URL = /(?:https?:\/\/\S+|file:\/\/\S+)/;
-const getLinkMatch = text => {
-  const match = text.match(RE_URL);
-  return match ? match[0] : null;
-};
-
 const Filter$2 = 'Filter';
 const IconButton = 'IconButton';
 const InputBox = 'InputBox';
@@ -1321,6 +1315,20 @@ const Line = 'Line';
 const OutputRepeatCount = 'OutputRepeatCount';
 const OutputSourceLink = 'OutputSourceLink';
 
+const RE_URL = /(?:https?:\/\/|file:\/\/|lvce(?:-oss)?:\/\/)\S+/;
+const trailingPunctuation = '!),.;?]}';
+const trimTrailingPunctuation = value => {
+  let end = value.length;
+  while (end > 0 && trailingPunctuation.includes(value[end - 1])) {
+    end--;
+  }
+  return value.slice(0, end);
+};
+const getLinkMatch = text => {
+  const match = text.match(RE_URL);
+  return match ? trimTrailingPunctuation(match[0]) : null;
+};
+
 const isStructuredLogEntry = value => {
   return value?.category === 'Window' && typeof value.level === 'string' && typeof value.line === 'number' && typeof value.message === 'string' && typeof value.source === 'string' && typeof value.timestamp === 'string';
 };
@@ -1356,7 +1364,6 @@ const parseStructuredLogLine = line => {
   if (!parsed.source) {
     return parts;
   }
-  const href = parsed.line > 0 ? `${parsed.source}:${parsed.line}` : parsed.source;
   return [...parts, {
     type: Text,
     value: ' '
@@ -1364,10 +1371,26 @@ const parseStructuredLogLine = line => {
     className: OutputSourceLink,
     label: getSourceLabel(parsed.source, parsed.line),
     type: Link,
-    value: href
+    value: parsed.source
   }];
 };
 
+const RE_SOURCE_LINK = /^lvce(?:-oss)?:\/\//;
+const RE_SOURCE_LOCATION = /:\d+(?::\d+)?$/;
+const getLinkPart = match => {
+  if (RE_SOURCE_LINK.test(match)) {
+    return {
+      className: OutputSourceLink,
+      label: match,
+      type: Link,
+      value: match.replace(RE_SOURCE_LOCATION, '')
+    };
+  }
+  return {
+    type: Link,
+    value: match
+  };
+};
 const parseLine = line => {
   const structuredLine = parseStructuredLogLine(line);
   if (structuredLine) {
@@ -1393,10 +1416,7 @@ const parseLine = line => {
         value: rest.slice(0, index)
       });
     }
-    parts.push({
-      type: Link,
-      value: match
-    });
+    parts.push(getLinkPart(match));
     rest = rest.slice(index + match.length);
   }
   if (parts.length === 0) {
@@ -1789,6 +1809,14 @@ const handleSelect = async (state, id) => {
   return selectChannel(state, id);
 };
 
+const handleSourceLinkClick = async (state, uri) => {
+  if (!uri) {
+    return state;
+  }
+  await invoke$1('Main.openUri', uri);
+  return state;
+};
+
 const sendMessagePortToExtensionHostWorker2 = async port => {
   await sendMessagePortToExtensionHostWorker(port);
 };
@@ -2078,6 +2106,15 @@ const renderFilterValue = (oldState, newState) => {
   return ['Viewlet.setValueByName', Filter$1, newState.filterValue];
 };
 
+const HandleBlur = 'handleBlur';
+const HandleClearFilterClick = 'handleClearFilterClick';
+const HandleContextMenu = 'handleContextMenu';
+const HandleFilterInput = 'handleFilterInput';
+const HandlePointerDown = 'handlePointerDown';
+const HandleSelect = 'handleSelect';
+const HandleButtonClick = 'handleButtonClick';
+const HandleSourceLinkClick = 'handleSourceLinkClick';
+
 const noNodes = [];
 const repeatCountNode = {
   childCount: 1,
@@ -2092,6 +2129,7 @@ const getLinePartDom = part => {
   switch (part.type) {
     case Link:
       {
+        const isSourceLink = part.className === OutputSourceLink;
         const linkNode = {
           childCount: 1,
           href: part.value,
@@ -2100,6 +2138,9 @@ const getLinePartDom = part => {
           type: A,
           ...(part.className && {
             className: part.className
+          }),
+          ...(isSourceLink && {
+            onClick: HandleSourceLinkClick
           })
         };
         return {
@@ -2237,14 +2278,6 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
-const HandleBlur = 'handleBlur';
-const HandleClearFilterClick = 'handleClearFilterClick';
-const HandleContextMenu = 'handleContextMenu';
-const HandleFilterInput = 'handleFilterInput';
-const HandlePointerDown = 'handlePointerDown';
-const HandleSelect = 'handleSelect';
-const HandleButtonClick = 'handleButtonClick';
-
 const getActionButtonVirtualDom = button => {
   const {
     icon,
@@ -2353,6 +2386,10 @@ const renderEventListeners = () => {
   }, {
     name: HandleClearFilterClick,
     params: ['clearFilter']
+  }, {
+    name: HandleSourceLinkClick,
+    params: ['handleSourceLinkClick', 'event.target.href'],
+    preventDefault: true
   }, {
     name: HandlePointerDown,
     params: ['handleClickAt', 'event.clientX', 'event.clientY']
@@ -2440,6 +2477,7 @@ const commandMap = {
   'Output.handleError': wrapCommand(handleError),
   'Output.handleFilterInput': wrapCommand(handleFilterInput),
   'Output.handleSelect': wrapCommand(handleSelect),
+  'Output.handleSourceLinkClick': wrapCommand(handleSourceLinkClick),
   'Output.initialize': initialize,
   'Output.loadContent2': wrapCommand(loadContent),
   'Output.openFindWidget': wrapCommand(openFindWidget),

package/package.json

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