@lvce-editor/editor-worker 1.3.0 → 1.5.0

package/dist/editorWorkerMain.js

@@ -966,11 +966,11 @@ const setText = (editor, text) => {
 };
 
 const editors = Object.create(null);
-const get$5 = id => {
+const get$6 = id => {
   number$1(id);
   return editors[id];
 };
-const set$5 = (id, oldEditor, newEditor) => {
+const set$6 = (id, oldEditor, newEditor) => {
   number$1(id);
   object(oldEditor);
   object(newEditor);
@@ -1046,10 +1046,10 @@ const number = value => {
 const state$1$1 = {
   callbacks: Object.create(null)
 };
-const set$4 = (id, fn) => {
+const set$5 = (id, fn) => {
   state$1$1.callbacks[id] = fn;
 };
-const get$4 = id => {
+const get$5 = id => {
   return state$1$1.callbacks[id];
 };
 const remove = id => {
@@ -1083,7 +1083,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = withResolvers$2();
-  set$4(id, resolve);
+  set$5(id, resolve);
   return {
     id,
     promise
@@ -1091,7 +1091,7 @@ const registerPromise = () => {
 };
 const resolve = (id, args) => {
   number(id);
-  const fn = get$4(id);
+  const fn = get$5(id);
   if (!fn) {
     console.log(args);
     warn$1(`callback ${id} may already be disposed`);
@@ -1431,23 +1431,23 @@ const state$8 = {
    */
   ipc: undefined
 };
-const get$3 = () => {
+const get$4 = () => {
   return state$8.ipc;
 };
-const set$3 = ipc => {
+const set$4 = ipc => {
   state$8.ipc = ipc;
 };
 
 const invoke$4 = (method, ...params) => {
-  const ipc = get$3();
+  const ipc = get$4();
   return invoke$5(ipc, method, ...params);
 };
 const invokeAndTransfer$1 = async (transfer, method, ...params) => {
-  const ipc = get$3();
+  const ipc = get$4();
   return invokeAndTransfer$2(ipc, transfer, method, ...params);
 };
 const listen$8 = ipc => {
-  set$3(ipc);
+  set$4(ipc);
 };
 
 const invoke$3 = async (method, ...params) => {
@@ -1821,7 +1821,7 @@ const createEditor = async ({
     focused: true
   };
   // console.log({ newEditor })
-  set$5(id, emptyEditor, newEditor4);
+  set$6(id, emptyEditor, newEditor4);
   await invoke$2(TextDocumentSyncFull, uri, id, languageId, content);
 };
 
@@ -3661,10 +3661,10 @@ const state$4 = {
   y: 0,
   editor: undefined
 };
-const get$2 = () => {
+const get$3 = () => {
   return state$4;
 };
-const set$2 = (editor, timeout, x, y) => {
+const set$3 = (editor, timeout, x, y) => {
   state$4.editor = editor;
   state$4.timeout = timeout;
   state$4.x = x;
@@ -3690,7 +3690,7 @@ const onHoverIdle = async () => {
     x,
     y,
     editor
-  } = get$2();
+  } = get$3();
   at(editor, x, y);
   await showHover$1();
 };
@@ -3701,12 +3701,12 @@ const handleMouseMove = (editor, x, y) => {
   if (!editor.hoverEnabled) {
     return editor;
   }
-  const oldState = get$2();
+  const oldState = get$3();
   if (oldState.timeout !== -1) {
     clearTimeout(oldState.timeout);
   }
   const timeout = setTimeout(onHoverIdle, hoverDelay);
-  set$2(editor, timeout, x, y);
+  set$3(editor, timeout, x, y);
   return editor;
 };
 
@@ -5176,7 +5176,7 @@ const setDecorations = (editor, decorations, diagnostics) => {
 };
 
 const getEditor = editorUid => {
-  const instance = get$5(editorUid);
+  const instance = get$6(editorUid);
   if (!instance) {
     throw new Error(`editor ${editorUid} not found`);
   }
@@ -5236,21 +5236,47 @@ const state$1 = {
 const has = languageId => {
   return languageId in state$1.tokenizers;
 };
-const set$1 = (languageId, tokenizer) => {
+const set$2 = (languageId, tokenizer) => {
   state$1.tokenizers[languageId] = tokenizer;
 };
-const get$1 = languageId => {
+const get$2 = languageId => {
   return state$1.tokenizers[languageId];
 };
 const isPending = languageId => {
   return languageId in state$1.pending;
 };
 
+let enabled$1 = false;
+const setEnabled$1 = value => {
+  enabled$1 = value;
+};
+const getEnabled$1 = () => {
+  return enabled$1;
+};
+
+const {
+  listen: listen$6,
+  invoke: invoke$1
+} = createRpc(SyntaxHighlightingWorker);
+
+const tokenMaps = Object.create(null);
+const set$1 = (languageId, tokenMap) => {
+  tokenMaps[languageId] = tokenMap;
+};
+const get$1 = languageId => {
+  return tokenMaps[languageId] || {};
+};
+
 // TODO loadTokenizer should be invoked from renderer worker
 const loadTokenizer = async (languageId, tokenizePath) => {
   if (!tokenizePath) {
     return;
   }
+  if (getEnabled$1()) {
+    const tokenMap = await invoke$1('Tokenizer.load', languageId, tokenizePath);
+    set$1(languageId, tokenMap);
+    return;
+  }
   try {
     // TODO check that tokenizer is valid
     // 1. tokenizeLine should be of type function
@@ -5264,7 +5290,8 @@ const loadTokenizer = async (languageId, tokenizePath) => {
       console.warn(`tokenizer.TokenMap should be an object in "${tokenizePath}"`);
       return;
     }
-    set$1(languageId, tokenizer);
+    set$1(languageId, tokenizer.TokenMap);
+    set$2(languageId, tokenizer);
   } catch (error) {
     // TODO better error handling
     console.error(error);
@@ -5273,7 +5300,7 @@ const loadTokenizer = async (languageId, tokenizePath) => {
 };
 const getTokenizer = languageId => {
   if (has(languageId)) {
-    return get$1(languageId);
+    return get$2(languageId);
   }
   if (isPending(languageId)) {
     return TokenizePlainText;
@@ -6391,19 +6418,19 @@ const getHover = async (editor, offset) => {
 };
 
 let _ipc;
-const listen$6 = async () => {
+const listen$5 = async () => {
   const ipc = await create$1({
     method: RendererProcess
   });
   handleIpc(ipc);
   _ipc = ipc;
 };
-const invoke$1 = async (method, ...args) => {
+const invoke = async (method, ...args) => {
   return invoke$5(_ipc, method, ...args);
 };
 
 const measureTextBlockHeight = (text, fontFamily, fontSize, lineHeight, width) => {
-  return invoke$1('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
+  return invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
 };
 
 const deepCopy = value => {
@@ -6541,7 +6568,7 @@ const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) =>
 };
 const getEditorHoverInfo = async (editorUid, position) => {
   number$1(editorUid);
-  const instance = get$5(editorUid);
+  const instance = get$6(editorUid);
   const editor = instance.newState;
   const {
     selections
@@ -6591,11 +6618,6 @@ const handleBeforeInput = (editor, inputType, data) => {
   }
 };
 
-const {
-  listen: listen$5,
-  invoke
-} = createRpc(SyntaxHighlightingWorker);
-
 let enabled = false;
 const setEnabled = value => {
   enabled = value;
@@ -6604,11 +6626,14 @@ const getEnabled = () => {
   return enabled;
 };
 
-const intialize = async syntaxHighlightingEnabled => {
-  await listen$6();
+const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
+  await listen$5();
   if (syntaxHighlightingEnabled) {
+    setEnabled$1(true);
+    await listen$6();
+  }
+  if (syncIncremental) {
     setEnabled(true);
-    await listen$5();
   }
   await listen$7();
 };
@@ -6869,11 +6894,34 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
   };
 };
 
+const sentLines = Object.create(null);
+
 // TODO only send changed lines to renderer process instead of all lines in viewport
-const getTokensViewport2 = (editor, startLineIndex, endLineIndex) => {
-  if (getEnabled()) {
+const getTokensViewport2 = (editor, startLineIndex, endLineIndex, syncIncremental) => {
+  if (getEnabled$1()) {
+    if (syncIncremental) {
+      const {
+        invalidStartIndex,
+        lines,
+        languageId,
+        id
+      } = editor;
+      let hasLinesToSend = true;
+      let linesToSend = lines;
+      if (sentLines[id] === lines) {
+        hasLinesToSend = false;
+        linesToSend = [];
+      } else {
+        sentLines[id] = lines;
+      }
+      const slimEditor = {
+        languageId,
+        invalidStartIndex
+      };
+      return invoke$1('GetTokensViewport.getTokensViewport', slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
+    }
     // TODO only send needed lines of text
-    return invoke('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex);
+    return invoke$1('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
   }
   return getTokensViewport(editor, startLineIndex, endLineIndex);
 };
@@ -7063,13 +7111,10 @@ const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLine
   const differences = [];
   const {
     lines,
-    tokenizerId,
-    decorations
+    decorations,
+    languageId
   } = editor;
-  const tokenizer = get(tokenizerId);
-  const {
-    TokenMap
-  } = tokenizer;
+  const tokenMap = get$1(languageId);
   let offset = minLineOffset;
   const tabSize = 2;
   for (let i = minLineY; i < maxLineY; i++) {
@@ -7078,7 +7123,7 @@ const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLine
     const {
       lineInfo,
       difference
-    } = getLineInfo(line, tokens[i - minLineY], embeddedResults, decorations, TokenMap, offset, normalize, tabSize, width, deltaX, averageCharWidth);
+    } = getLineInfo(line, tokens[i - minLineY], embeddedResults, decorations, tokenMap, offset, normalize, tabSize, width, deltaX, averageCharWidth);
     result.push(lineInfo);
     differences.push(difference);
     offset += line.length + 1;
@@ -7088,7 +7133,7 @@ const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLine
     differences
   };
 };
-const getVisible = async editor => {
+const getVisible = async (editor, syncIncremental) => {
   // console.log({ editor })
   // TODO should separate rendering from business logic somehow
   // currently hard to test because need to mock editor height, top, left,
@@ -7112,7 +7157,7 @@ const getVisible = async editor => {
     tokens,
     tokenizersToLoad,
     embeddedResults
-  } = await getTokensViewport2(editor, minLineY, maxLineY);
+  } = await getTokensViewport2(editor, minLineY, maxLineY, syncIncremental);
   const minLineOffset = offsetAtSync(editor, minLineY, 0);
   const averageCharWidth = charWidth;
   const {
@@ -7312,10 +7357,11 @@ const renderLines = {
     if (incrementalEdits) {
       return [/* method */'setIncrementalEdits', /* incrementalEdits */incrementalEdits];
     }
+    const syncIncremental = getEnabled();
     const {
       textInfos,
       differences
-    } = await getVisible(newState);
+    } = await getVisible(newState, syncIncremental);
     newState.differences = differences;
     const dom = getEditorRowsVirtualDom(textInfos, differences);
     return [/* method */'setText', dom];
@@ -7395,7 +7441,7 @@ const renderGutterInfo = {
 };
 const render = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus, renderDecorations, renderGutterInfo];
 const renderEditor = async id => {
-  const instance = get$5(id);
+  const instance = get$6(id);
   if (!instance) {
     return [];
   }
@@ -7409,7 +7455,7 @@ const renderEditor = async id => {
       commands.push(await item.apply(oldState, newState));
     }
   }
-  set$5(id, newState, newState);
+  set$6(id, newState, newState);
   return commands;
 };
 
@@ -7418,9 +7464,9 @@ const keep = ['ColorPicker.handleSliderPointerDown', 'ColorPicker.handleSliderPo
 // TODO wrap commands globally, not per editor
 // TODO only store editor state in editor worker, not in renderer worker also
 const wrapCommand = fn => async (editorUid, ...args) => {
-  const oldInstance = get$5(editorUid);
+  const oldInstance = get$6(editorUid);
   const newEditor = await fn(oldInstance.newState, ...args);
-  set$5(editorUid, oldInstance.newState, newEditor);
+  set$6(editorUid, oldInstance.newState, newEditor);
   // TODO if possible, rendering should be sync
   const commands = await renderEditor(editorUid);
   newEditor.commands = commands;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",