@lvce-editor/output-view 2.17.0 → 2.18.0

package/dist/outputViewWorkerMain.js

@@ -1117,7 +1117,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$4 = (id, rpc) => {
+const set$6 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1150,7 +1150,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$4(rpcId, mockRpc);
+      set$6(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1159,7 +1159,7 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$4(rpcId, rpc);
+      set$6(rpcId, rpc);
     }
   };
 };
@@ -1167,34 +1167,40 @@ const create$2 = rpcId => {
 const ExtensionManagementWorker = 9006;
 const FileSystemWorker = 209;
 const OutputWorker = 7001;
+const RendererProcess = 1670;
 const RendererWorker = 1;
 
 const {
-  invoke: invoke$2,
-  set: set$3
+  invoke: invoke$4,
+  set: set$5
 } = create$2(ExtensionManagementWorker);
 
 const {
-  invoke: invoke$1,
-  set: set$2
+  invoke: invoke$3,
+  set: set$4
 } = create$2(FileSystemWorker);
 const readFile = async uri => {
-  return invoke$1('FileSystem.readFile', uri);
+  return invoke$3('FileSystem.readFile', uri);
 };
 const writeFile = async (uri, content) => {
-  return invoke$1('FileSystem.writeFile', uri, content);
+  return invoke$3('FileSystem.writeFile', uri, content);
 };
 const watchFile = async (watchId, uri, rpcId) => {
-  await invoke$1('FileSystem.watchFile', watchId, uri, rpcId);
+  await invoke$3('FileSystem.watchFile', watchId, uri, rpcId);
 };
 const unwatchFile = async watchId => {
-  await invoke$1('FileSystem.unwatchFile', watchId);
+  await invoke$3('FileSystem.unwatchFile', watchId);
 };
 
 const {
-  invoke,
+  invoke: invoke$2,
+  set: set$3
+} = create$2(RendererProcess);
+
+const {
+  invoke: invoke$1,
   invokeAndTransfer,
-  set: set$1
+  set: set$2
 } = create$2(RendererWorker);
 const sendMessagePortToFileSystemWorker$1 = async (port, rpcId) => {
   const command = 'FileSystem.handleMessagePort';
@@ -1205,10 +1211,10 @@ const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
 const showSaveFilePicker = async () => {
-  return invoke('FilePicker.showSaveFilePicker');
+  return invoke$1('FilePicker.showSaveFilePicker');
 };
 const getLogsDir$1 = async () => {
-  return invoke('PlatformPaths.getLogsDir');
+  return invoke$1('PlatformPaths.getLogsDir');
 };
 
 const toCommandId = key => {
@@ -1429,20 +1435,30 @@ const parseStructuredLogLine = line => {
   }, {
     className: OutputSourceLink,
     label: getSourceLabel(parsed.source, parsed.line),
+    lineNumber: parsed.line,
     type: Link,
     value: parsed.source
   }];
 };
 
 const RE_SOURCE_LINK = /^lvce(?:-oss)?:\/\//;
-const RE_SOURCE_LOCATION = /:\d+(?::\d+)?$/;
+const RE_SOURCE_LOCATION = /:(\d+)(?::(\d+))?$/;
 const getLinkPart = match => {
   if (RE_SOURCE_LINK.test(match)) {
+    const locationMatch = match.match(RE_SOURCE_LOCATION);
+    const lineNumber = locationMatch ? Number(locationMatch[1]) : undefined;
+    const columnNumber = locationMatch?.[2] ? Number(locationMatch[2]) : undefined;
     return {
       className: OutputSourceLink,
+      ...(columnNumber !== undefined && {
+        columnNumber
+      }),
       label: match,
+      ...(lineNumber !== undefined && {
+        lineNumber
+      }),
       type: Link,
-      value: match.replace(RE_SOURCE_LOCATION, '')
+      value: locationMatch ? match.slice(0, -locationMatch[0].length) : match
     };
   }
   return {
@@ -1489,7 +1505,7 @@ const parseLine = line => {
 
 const readOutput = async uri => {
   if (isExtensionOutputUri(uri)) {
-    return invoke$2('Extensions.readOutputChannel', uri);
+    return invoke$4('Extensions.readOutputChannel', uri);
   }
   return readFile(uri);
 };
@@ -1520,7 +1536,7 @@ const loadLines = async uri => {
 
 const clearOutput$1 = async uri => {
   if (isExtensionOutputUri(uri)) {
-    await invoke$2('Extensions.clearOutputChannel', uri);
+    await invoke$4('Extensions.clearOutputChannel', uri);
     return;
   }
   await writeFile(uri, '');
@@ -1570,7 +1586,7 @@ const {
   getCommandIds,
   getKeys,
   registerCommands,
-  set,
+  set: set$1,
   wrapCommand,
   wrapGetter
 } = create$1();
@@ -1607,7 +1623,7 @@ const create = (id, uri, x, y, width, height, platform, parentId) => {
     x,
     y
   };
-  set(id, state, state);
+  set$1(id, state, state);
 };
 
 const isEqual$2 = (oldState, newState) => {
@@ -1824,6 +1840,31 @@ const handleFilterInput = async (state, value, inputSource = User) => {
   };
 };
 
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
+};
+const set = rpc => {
+  set$3(rpc);
+  state.connected = true;
+};
+
+const handleMessagePort = async port => {
+  const rpc = await create$6({
+    commandMap: {},
+    messagePort: port
+  });
+  set(rpc);
+};
+
 const createWatchId = () => {
   const watchId = Math.random();
   return watchId;
@@ -1835,7 +1876,7 @@ const handleFileChange = async watchId => {
     const instance = get(key);
     if (instance.newState.watchId === watchId) {
       // @ts-ignore
-      await invoke('Output.refresh');
+      await invoke$1('Output.refresh');
     }
   }
 };
@@ -1904,11 +1945,21 @@ const handleSelect = async (state, id) => {
   return selectChannel(state, id);
 };
 
-const handleSourceLinkClick = async (state, uri) => {
+const handleSourceLinkClick = async (state, uri, lineNumber, columnNumber) => {
   if (!uri) {
     return state;
   }
-  await invoke('Main.openUri', uri);
+  const line = Number(lineNumber);
+  if (!Number.isSafeInteger(line) || line <= 0) {
+    await invoke$1('Main.openUri', uri);
+    return state;
+  }
+  const column = Number(columnNumber);
+  const rowIndex = line - 1;
+  const columnIndex = Number.isSafeInteger(column) && column > 0 ? column - 1 : 0;
+  await invoke$1('Main.openUri', uri, true, {
+    selections: new Uint32Array([rowIndex, columnIndex, rowIndex, columnIndex])
+  });
   return state;
 };
 
@@ -1922,7 +1973,7 @@ const createExtensionManagementWorkerRpc = async () => {
 
 const initializeExtensionManagementWorker = async () => {
   const rpc = await createExtensionManagementWorkerRpc();
-  set$3(rpc);
+  set$5(rpc);
 };
 
 const sendMessagePortToFileSystemWorker = async port => {
@@ -1943,7 +1994,7 @@ const createFileSystemWorkerRpc = async () => {
 
 const initializeFileSystemWorker = async () => {
   const rpc = await createFileSystemWorkerRpc();
-  set$2(rpc);
+  set$4(rpc);
 };
 
 const initialize = async () => {
@@ -2018,7 +2069,7 @@ const error = error => {
 
 const getExtensionOptions = async () => {
   try {
-    const channels = await invoke$2('Extensions.getOutputChannelProviders');
+    const channels = await invoke$4('Extensions.getOutputChannelProviders');
     return channels;
   } catch (error$1) {
     error(error$1);
@@ -2215,6 +2266,12 @@ const getLinePartDom = part => {
           ...(part.className && {
             className: part.className
           }),
+          ...(part.columnNumber !== undefined && {
+            'data-column': part.columnNumber
+          }),
+          ...(part.lineNumber !== undefined && {
+            'data-line': part.lineNumber
+          }),
           ...(isSourceLink && {
             onClick: HandleSourceLinkClick
           })
@@ -2344,14 +2401,23 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
+const renderDirect = async (uid, commands) => {
+  const rendererWorkerCommands = commands.filter(command => command[0] === 'Viewlet.setFocusContext');
+  const rendererProcessCommands = commands.filter(command => command[0] !== 'Viewlet.setFocusContext');
+  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
+  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
+};
 const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
   } = get(uid);
-  set(uid, newState, newState);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
-  return commands;
+  if (!isConnected()) {
+    return commands;
+  }
+  return renderDirect(uid, commands);
 };
 
 const getActionButtonVirtualDom = button => {
@@ -2464,7 +2530,7 @@ const renderEventListeners = () => {
     params: ['clearFilter']
   }, {
     name: HandleSourceLinkClick,
-    params: ['handleSourceLinkClick', 'event.target.href'],
+    params: ['handleSourceLinkClick', 'event.target.href', 'event.target.dataset.line', 'event.target.dataset.column'],
     preventDefault: true
   }, {
     name: HandlePointerDown,
@@ -2552,6 +2618,7 @@ const commandMap = {
   'Output.handleData': wrapCommand(handleData),
   'Output.handleError': wrapCommand(handleError),
   'Output.handleFilterInput': wrapCommand(handleFilterInput),
+  'Output.handleMessagePort': handleMessagePort,
   'Output.handleSelect': wrapCommand(handleSelect),
   'Output.handleSourceLinkClick': wrapCommand(handleSourceLinkClick),
   'Output.initialize': initialize,
@@ -2578,7 +2645,7 @@ const listen = async () => {
   const rpc = await create$3({
     commandMap: commandMapRef
   });
-  set$1(rpc);
+  set$2(rpc);
 };
 
 const main = async () => {

package/package.json

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