@lvce-editor/editor-worker 1.1.0 → 1.3.0

package/dist/editorWorkerMain.js

@@ -1283,7 +1283,7 @@ const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(message, errorProperty);
 };
-const create$4 = (message, result) => {
+const create$5 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -1292,7 +1292,7 @@ const create$4 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$4(message, resultProperty);
+  return create$5(message, resultProperty);
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
@@ -1323,7 +1323,7 @@ const handleJsonRpcMessage = async (ipc, message, execute, resolve, preparePrett
   }
   throw new JsonRpcError('unexpected message');
 };
-const invoke$4 = async (ipc, method, ...params) => {
+const invoke$5 = async (ipc, method, ...params) => {
   const {
     message,
     promise
@@ -1383,7 +1383,7 @@ const preparePrettyError = error => {
   return error;
 };
 const logError$1 = error => {
-  console.error(error);
+  // handled in renderer worker
 };
 const handleMessage = event => {
   return handleJsonRpcMessage(event.target, event.data, execute$1, resolve, preparePrettyError, logError$1, requiresSocket);
@@ -1400,6 +1400,7 @@ const handleIpc = ipc => {
 
 const RendererProcess = 9;
 const ExtensionHostWorker = 10;
+const SyntaxHighlightingWorker = 11;
 
 // @ts-ignore
 const getData = event => {
@@ -1437,20 +1438,20 @@ const set$3 = ipc => {
   state$8.ipc = ipc;
 };
 
-const invoke$3 = (method, ...params) => {
+const invoke$4 = (method, ...params) => {
   const ipc = get$3();
-  return invoke$4(ipc, method, ...params);
+  return invoke$5(ipc, method, ...params);
 };
 const invokeAndTransfer$1 = async (transfer, method, ...params) => {
   const ipc = get$3();
   return invokeAndTransfer$2(ipc, transfer, method, ...params);
 };
-const listen$7 = ipc => {
+const listen$8 = ipc => {
   set$3(ipc);
 };
 
-const invoke$2 = async (method, ...params) => {
-  return invoke$3(method, ...params);
+const invoke$3 = async (method, ...params) => {
+  return invoke$4(method, ...params);
 };
 const invokeAndTransfer = async (transfer, method, ...params) => {
   return invokeAndTransfer$1(transfer, method, ...params);
@@ -1488,7 +1489,7 @@ const waitForFirstMessage$1 = async port => {
   return event;
 };
 
-const create$3 = async () => {
+const create$4 = async () => {
   const {
     port1,
     port2
@@ -1500,7 +1501,7 @@ const create$3 = async () => {
   }
   return port2;
 };
-const wrap$1 = port => {
+const wrap$3 = port => {
   return {
     port,
     /**
@@ -1532,6 +1533,59 @@ const wrap$1 = port => {
 };
 
 const IpcParentWithExtensionHostWorker = {
+  __proto__: null,
+  create: create$4,
+  wrap: wrap$3
+};
+
+const sendMessagePortToSyntaxHighlightingWorker = async port => {
+  await invokeAndTransfer([port], 'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
+};
+
+const create$3 = async () => {
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  await sendMessagePortToSyntaxHighlightingWorker(port1);
+  const event = await waitForFirstMessage$1(port2);
+  if (event.data !== 'ready') {
+    throw new IpcError$1('unexpected first message');
+  }
+  return port2;
+};
+const wrap$1 = port => {
+  return {
+    port,
+    /**
+     * @type {any}
+     */
+    listener: undefined,
+    get onmessage() {
+      return this.listener;
+    },
+    set onmessage(listener) {
+      this.listener = listener;
+      const wrappedListener = event => {
+        const data = getData(event);
+        // @ts-ignore
+        listener({
+          target: this,
+          data
+        });
+      };
+      this.port.onmessage = wrappedListener;
+    },
+    send(message) {
+      this.port.postMessage(message);
+    },
+    sendAndTransfer(message, transfer) {
+      this.port.postMessage(message, transfer);
+    }
+  };
+};
+
+const IpcParentWithSyntaxHighlightingWorker = {
   __proto__: null,
   create: create$3,
   wrap: wrap$1
@@ -1596,6 +1650,8 @@ const getModule$1 = method => {
       return IpcParentWithRendererProcess;
     case ExtensionHostWorker:
       return IpcParentWithExtensionHostWorker;
+    case SyntaxHighlightingWorker:
+      return IpcParentWithSyntaxHighlightingWorker;
     default:
       throw new Error('unexpected ipc type');
   }
@@ -1616,18 +1672,29 @@ const create$1 = async ({
   return ipc;
 };
 
-let _ipc$1;
-const listen$6 = async () => {
-  const ipc = await create$1({
-    method: ExtensionHostWorker
-  });
-  handleIpc(ipc);
-  _ipc$1 = ipc;
-};
-const invoke$1 = (method, ...params) => {
-  return invoke$4(_ipc$1, method, ...params);
+const createRpc = method => {
+  let _ipc;
+  const listen = async () => {
+    const ipc = await create$1({
+      method
+    });
+    handleIpc(ipc);
+    _ipc = ipc;
+  };
+  const invoke = (method, ...params) => {
+    return invoke$5(_ipc, method, ...params);
+  };
+  return {
+    listen,
+    invoke
+  };
 };
 
+const {
+  listen: listen$7,
+  invoke: invoke$2
+} = createRpc(ExtensionHostWorker);
+
 const HoverExecute = 'ExtensionHostHover.execute';
 const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
 
@@ -1755,7 +1822,7 @@ const createEditor = async ({
   };
   // console.log({ newEditor })
   set$5(id, emptyEditor, newEditor4);
-  await invoke$1(TextDocumentSyncFull, uri, id, languageId, content);
+  await invoke$2(TextDocumentSyncFull, uri, id, languageId, content);
 };
 
 // @ts-ignore
@@ -2093,7 +2160,7 @@ const editorShowMessage = async (editor, rowIndex, columnIndex, message, isError
   const x$1 = x(editor, rowIndex, columnIndex);
   const y$1 = y(editor, rowIndex);
   const displayErrorMessage = message;
-  await invoke$2('Editor.showOverlayMessage', editor, 'Viewlet.send', editor.uid, 'showOverlayMessage', x$1, y$1, displayErrorMessage);
+  await invoke$3('Editor.showOverlayMessage', editor, 'Viewlet.send', editor.uid, 'showOverlayMessage', x$1, y$1, displayErrorMessage);
   if (!isError) {
     const handleTimeout = () => {
       editorHideMessage(editor);
@@ -2149,7 +2216,7 @@ const braceCompletion = async (editor, text) => {
   try {
     // @ts-ignore
     const offset = offsetAt(editor, editor.cursor);
-    const result = await invoke$2('ExtensionHostBraceCompletion.executeBraceCompletionProvider', editor, offset, text);
+    const result = await invoke$3('ExtensionHostBraceCompletion.executeBraceCompletionProvider', editor, offset, text);
     if (result) {
       const closingBrace = getMatchingClosingBrace$1(text);
       const insertText = text + closingBrace;
@@ -2183,7 +2250,7 @@ const cancelSelection = editor => {
 const closeCompletion = async editor => {
   // TODO
   const completionUid = editor.completionUid;
-  await invoke$2('Viewlet.dispose', completionUid);
+  await invoke$3('Viewlet.dispose', completionUid);
   editor.completionUid = 0;
   return editor;
 };
@@ -2321,7 +2388,7 @@ let VError$1 = class VError extends Error {
 const writeText = async text => {
   try {
     string(text);
-    await invoke$2('ClipBoard.writeText', /* text */text);
+    await invoke$3('ClipBoard.writeText', /* text */text);
   } catch (error) {
     throw new VError$1(error, 'Failed to write text to clipboard');
   }
@@ -3005,7 +3072,7 @@ const deleteWordRight = editor => {
 };
 
 const findAllReferences = async editor => {
-  await invoke$2('SideBar.show', 'References', /* focus */true);
+  await invoke$3('SideBar.show', 'References', /* focus */true);
   return editor;
 };
 
@@ -3019,7 +3086,7 @@ const findAllReferences = async editor => {
 // TODO should be in editor folder
 
 const format$1 = async editor => {
-  const edits = await invoke$2('Format.format', editor);
+  const edits = await invoke$3('Format.format', editor);
   return edits;
 };
 
@@ -3129,7 +3196,7 @@ const getWordBefore = (editor, rowIndex, columnIndex) => {
 
 // @ts-ignore
 const getDefinition = async (editor, offset) => {
-  const definition = await invoke$2('ExtensionHostDefinition.executeDefinitionProvider', editor, offset);
+  const definition = await invoke$3('ExtensionHostDefinition.executeDefinitionProvider', editor, offset);
   return definition;
 };
 
@@ -3268,7 +3335,7 @@ const goTo = async ({
       endRowIndex: definition.endRowIndex,
       endColumnIndex: definition.endColumnIndex
     };
-    await invoke$2( /* Main.openUri */'Main.openUri', /* uri */uri, /* focus */true, context);
+    await invoke$3( /* Main.openUri */'Main.openUri', /* uri */uri, /* focus */true, context);
     return editor;
   } catch (error) {
     // TODO if editor is already disposed at this point, do nothing
@@ -3349,7 +3416,7 @@ const getNoLocationFoundMessage = info => {
 };
 
 const getTypeDefinition = async (editor, offset) => {
-  const definition = await invoke$2('ExtensionHostTypeDefinition.executeTypeDefinitionProvider', editor, offset);
+  const definition = await invoke$3('ExtensionHostTypeDefinition.executeTypeDefinitionProvider', editor, offset);
   return definition;
 };
 
@@ -3393,7 +3460,7 @@ const goToTypeDefinition = (editor, explicit = true) => {
 const Editor = 3;
 
 const handleContextMenu = async (editor, button, x, y) => {
-  await invoke$2( /* ContextMenu.show */'ContextMenu.show', /* x */x, /* y */y, /* id */Editor);
+  await invoke$3( /* ContextMenu.show */'ContextMenu.show', /* x */x, /* y */y, /* id */Editor);
   return editor;
 };
 
@@ -3431,7 +3498,7 @@ const WhenExpressionEditorText = 12;
 const handleFocus = editor => {
   // TODO make change events functional,
   // when rendering, send focus changes to renderer worker
-  invoke$2('Focus.setFocus', WhenExpressionEditorText);
+  invoke$3('Focus.setFocus', WhenExpressionEditorText);
   return editor;
 };
 
@@ -4174,7 +4241,7 @@ const indentMore = editor => {
 };
 
 const getLanguageConfiguration = editor => {
-  return invoke$2('Languages.getLanguageConfiguration', {
+  return invoke$3('Languages.getLanguageConfiguration', {
     uri: editor.uri,
     languageId: editor.languageId
   });
@@ -4391,13 +4458,13 @@ const moveSelectionPx = (editor, x, y) => {
 
 const FindWidget = 'FindWidget';
 const openFind = async state => {
-  await invoke$2('Viewlet.openWidget', FindWidget);
+  await invoke$3('Viewlet.openWidget', FindWidget);
   return state;
 };
 
 const organizeImports = async editor => {
   // TODO ask extension host worker directly
-  const edits = await invoke$2('ExtensionHostOrganizeImports.organizeImports', editor);
+  const edits = await invoke$3('ExtensionHostOrganizeImports.organizeImports', editor);
   console.log({
     edits
   });
@@ -4414,7 +4481,7 @@ const pasteText = (editor, text) => {
 };
 
 const paste = async editor => {
-  const text = await invoke$2('ClipBoard.readText');
+  const text = await invoke$3('ClipBoard.readText');
   string(text);
   return pasteText(editor, text);
 };
@@ -4552,7 +4619,7 @@ const save = async editor => {
     const uri = editor.uri;
     const newEditor = await getNewEditor(editor);
     const content = getText(newEditor);
-    await invoke$2('FileSystem.writeFile', uri, content);
+    await invoke$3('FileSystem.writeFile', uri, content);
     return newEditor;
   } catch (error) {
     // @ts-ignore
@@ -5083,7 +5150,7 @@ const selectWordRight = editor => {
 // import * as ExtensionHostSelection from '../ExtensionHost/ExtensionHostSelection.ts'
 
 const getNewSelections = async (editor, selections) => {
-  const newSelections = await invoke$2('ExtensionHostSelection.executeGrowSelection', editor, selections);
+  const newSelections = await invoke$3('ExtensionHostSelection.executeGrowSelection', editor, selections);
   if (newSelections.length === 0) {
     return selections;
   }
@@ -5287,7 +5354,7 @@ const setSelections = (editor, selections) => {
 
 const EditorHover = 'EditorHover';
 const showHover = async state => {
-  await invoke$2('Viewlet.openWidget', EditorHover);
+  await invoke$3('Viewlet.openWidget', EditorHover);
   return state;
 };
 
@@ -5298,7 +5365,7 @@ const showSourceActions = async editor => {
   // 2. query source actions from extension host
   // 3. show source actions menu
 
-  await invoke$2('Viewlet.openWidget', EditorSourceActions);
+  await invoke$3('Viewlet.openWidget', EditorSourceActions);
   return editor;
 };
 
@@ -5369,7 +5436,7 @@ const getTabCompletion = async editor => {
   const rowIndex = selections[0];
   const columnIndex = selections[1];
   const offset = offsetAt(editor, rowIndex, columnIndex);
-  const tabCompletion = await invoke$2('ExtensionHostTabCompletion.executeTabCompletionProvider', editor, offset);
+  const tabCompletion = await invoke$3('ExtensionHostTabCompletion.executeTabCompletionProvider', editor, offset);
   return tabCompletion;
 };
 
@@ -5866,7 +5933,7 @@ const typeWithAutoClosingQuote = (editor, text) => {
 
 const typeWithAutoClosingTag = async (editor, text) => {
   const offset = offsetAt(editor, editor.selections[0], editor.selections[1]);
-  const result = await invoke$2('ExtensionHostClosingTagCompletion.executeClosingTagProvider', editor, offset, text);
+  const result = await invoke$3('ExtensionHostClosingTagCompletion.executeClosingTagProvider', editor, offset, text);
   if (!result) {
     const changes = editorReplaceSelections(editor, [text], EditorType);
     return scheduleDocumentAndCursorsSelections(editor, changes);
@@ -6286,7 +6353,7 @@ const OnHover = 'onHover';
 
 // TODO add tests for this
 const activateByEvent = async event => {
-  await invoke$2('ExtensionHostManagement.activateByEvent', event);
+  await invoke$3('ExtensionHostManagement.activateByEvent', event);
 };
 
 const execute = async ({
@@ -6299,7 +6366,7 @@ const execute = async ({
 }) => {
   const fullEvent = `${event}:${editor.languageId}`;
   await activateByEvent(fullEvent);
-  const result = await invoke$1(method, editor.uid, ...args);
+  const result = await invoke$2(method, editor.uid, ...args);
   return result;
 };
 
@@ -6324,19 +6391,19 @@ const getHover = async (editor, offset) => {
 };
 
 let _ipc;
-const listen$5 = async () => {
+const listen$6 = async () => {
   const ipc = await create$1({
     method: RendererProcess
   });
   handleIpc(ipc);
   _ipc = ipc;
 };
-const invoke = async (method, ...args) => {
-  return invoke$4(_ipc, method, ...args);
+const invoke$1 = async (method, ...args) => {
+  return invoke$5(_ipc, method, ...args);
 };
 
 const measureTextBlockHeight = (text, fontFamily, fontSize, lineHeight, width) => {
-  return invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
+  return invoke$1('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
 };
 
 const deepCopy = value => {
@@ -6524,9 +6591,26 @@ const handleBeforeInput = (editor, inputType, data) => {
   }
 };
 
-const intialize = async () => {
-  await listen$5();
+const {
+  listen: listen$5,
+  invoke
+} = createRpc(SyntaxHighlightingWorker);
+
+let enabled = false;
+const setEnabled = value => {
+  enabled = value;
+};
+const getEnabled = () => {
+  return enabled;
+};
+
+const intialize = async syntaxHighlightingEnabled => {
   await listen$6();
+  if (syntaxHighlightingEnabled) {
+    setEnabled(true);
+    await listen$5();
+  }
+  await listen$7();
 };
 
 // TODO move cursor
@@ -6785,6 +6869,15 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
   };
 };
 
+// TODO only send changed lines to renderer process instead of all lines in viewport
+const getTokensViewport2 = (editor, startLineIndex, endLineIndex) => {
+  if (getEnabled()) {
+    // TODO only send needed lines of text
+    return invoke('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex);
+  }
+  return getTokensViewport(editor, startLineIndex, endLineIndex);
+};
+
 const loadTokenizers = async languageIds => {
   for (const languageId of languageIds) {
     // @ts-ignore
@@ -6995,7 +7088,7 @@ const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLine
     differences
   };
 };
-const getVisible = editor => {
+const getVisible = async editor => {
   // console.log({ editor })
   // TODO should separate rendering from business logic somehow
   // currently hard to test because need to mock editor height, top, left,
@@ -7019,7 +7112,7 @@ const getVisible = editor => {
     tokens,
     tokenizersToLoad,
     embeddedResults
-  } = getTokensViewport(editor, minLineY, maxLineY);
+  } = await getTokensViewport2(editor, minLineY, maxLineY);
   const minLineOffset = offsetAtSync(editor, minLineY, 0);
   const averageCharWidth = charWidth;
   const {
@@ -7214,7 +7307,7 @@ const renderLines = {
   isEqual(oldState, newState) {
     return oldState.lines === newState.lines && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.deltaX === newState.deltaX && oldState.width === newState.width;
   },
-  apply(oldState, newState) {
+  async apply(oldState, newState) {
     const incrementalEdits = getIncrementalEdits(oldState, newState);
     if (incrementalEdits) {
       return [/* method */'setIncrementalEdits', /* incrementalEdits */incrementalEdits];
@@ -7222,7 +7315,7 @@ const renderLines = {
     const {
       textInfos,
       differences
-    } = getVisible(newState);
+    } = await getVisible(newState);
     newState.differences = differences;
     const dom = getEditorRowsVirtualDom(textInfos, differences);
     return [/* method */'setText', dom];
@@ -7301,7 +7394,7 @@ const renderGutterInfo = {
   }
 };
 const render = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus, renderDecorations, renderGutterInfo];
-const renderEditor = id => {
+const renderEditor = async id => {
   const instance = get$5(id);
   if (!instance) {
     return [];
@@ -7313,7 +7406,7 @@ const renderEditor = id => {
   const commands = [];
   for (const item of render) {
     if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
+      commands.push(await item.apply(oldState, newState));
     }
   }
   set$5(id, newState, newState);
@@ -7328,7 +7421,8 @@ const wrapCommand = fn => async (editorUid, ...args) => {
   const oldInstance = get$5(editorUid);
   const newEditor = await fn(oldInstance.newState, ...args);
   set$5(editorUid, oldInstance.newState, newEditor);
-  const commands = renderEditor(editorUid);
+  // TODO if possible, rendering should be sync
+  const commands = await renderEditor(editorUid);
   newEditor.commands = commands;
   return newEditor;
 };
@@ -7899,7 +7993,7 @@ const listen = async () => {
     method: Auto()
   });
   handleIpc(ipc);
-  listen$7(ipc);
+  listen$8(ipc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",
@@ -49,5 +49,12 @@
     "ignores": [
       "distmin"
     ]
+  },
+  "nodemonConfig": {
+    "watch": [
+      "src"
+    ],
+    "ext": "ts,js",
+    "exec": "node scripts/build.js"
   }
 }