@lvce-editor/editor-worker 13.1.0 → 13.3.0

package/dist/editorWorkerMain.js

@@ -899,7 +899,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const responseMessage = await promise;
   return unwrapJsonRpcResult(responseMessage);
 };
-const send = (transport, method, ...params) => {
+const send$1 = (transport, method, ...params) => {
   const message = create$4$2(method, params);
   transport.send(message);
 };
@@ -939,7 +939,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
+      send$1(ipc, method, ...params);
     },
     invoke(method, ...params) {
       return invoke$c(ipc, method, ...params);
@@ -1136,6 +1136,7 @@ const EditorWorker = 99;
 const ExtensionHostWorker = 44;
 const MarkdownWorker = 300;
 const RendererWorker = 1;
+const TextMeasurementWorker = 7011;
 
 const FocusEditorText$1 = 12;
 
@@ -1216,6 +1217,11 @@ const {
   invoke: invoke$a,
   invokeAndTransfer: invokeAndTransfer$1,
   set: set$9} = create$9(RendererWorker);
+const sendMessagePortToTextMeasurementWorker = async port => {
+  const command = 'TextMeasurement.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
+};
 
 const {
   invoke: invoke$9,
@@ -2435,7 +2441,7 @@ const getTabCount = string => {
   return count;
 };
 
-const measureTextWidthFast = (text, charWidth) => {
+const measureTextWidthFast = async (text, charWidth) => {
   return text.length * charWidth;
 };
 
@@ -2474,7 +2480,7 @@ const getContext = () => {
 
 // TODO for text editor, could dispose measuring canvas after editor has been initialized to free up offscreencanvas space
 
-const measureTextWidthSlow = (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
+const measureTextWidthSlow = async (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
   string(text);
   number(fontWeight);
   number(fontSize);
@@ -2496,14 +2502,14 @@ const measureTextWidthSlow = (text, fontWeight, fontSize, fontFamily, letterSpac
   return width;
 };
 
-const measureTextWidth = (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
+const measureTextWidth = async (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
   if (isMonoSpaceFont) {
-    return measureTextWidthFast(text, charWidth);
+    return await measureTextWidthFast(text, charWidth);
   }
-  return measureTextWidthSlow(text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
+  return await measureTextWidthSlow(text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
 };
 
-const getX = (line, column, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, difference = 0) => {
+const getX = async (line, column, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, difference = 0) => {
   if (!line) {
     return 0;
   }
@@ -2525,7 +2531,8 @@ const getX = (line, column, fontWeight, fontSize, fontFamily, isMonospaceFont, l
   const normalizedLine = normalizeText(line, normalize, tabSize);
   const tabCount = getTabCount(line.slice(0, column));
   const partialText = normalizedLine.slice(0, column + tabCount);
-  return measureTextWidth(partialText, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, averageCharWidth) - halfCursorWidth + difference;
+  const textWidth = await measureTextWidth(partialText, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, averageCharWidth);
+  return textWidth - halfCursorWidth + difference;
 };
 
 const getY = (row, minLineY, rowHeight) => {
@@ -2642,7 +2649,7 @@ const getSelectionArray = visibleSelections => {
   }
   return selectionsArray;
 };
-const getVisible = editor => {
+const getVisible = async editor => {
   const visibleCursors = [];
   const visibleSelections = [];
   // // TODO binary search
@@ -2675,7 +2682,7 @@ const getVisible = editor => {
     const relativeEndLineRow = selectionEndRow - minLineY;
     const endLineDifference = differences[relativeEndLineRow];
     const endLine = lines[selectionEndRow];
-    const endLineEndX = getX(endLine, selectionEndColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, endLineDifference);
+    const endLineEndX = await getX(endLine, selectionEndColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, endLineDifference);
     const endLineY = getY(selectionEndRow, minLineY, rowHeight);
     if (isEmpty(selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) && endLineEndX > 0) {
       visibleCursors.push(endLineEndX, endLineY);
@@ -2685,7 +2692,7 @@ const getVisible = editor => {
     const startLineYRelative = selectionStartRow - minLineY;
     const startLineDifference = differences[startLineYRelative];
     if (selectionStartRow === selectionEndRow) {
-      const startX = getX(endLine, selectionStartColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, startLineDifference);
+      const startX = await getX(endLine, selectionStartColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, startLineDifference);
       if (reversed) {
         visibleCursors.push(startX, endLineY);
       } else if (endLineEndX >= 0) {
@@ -2696,8 +2703,8 @@ const getVisible = editor => {
     } else {
       if (selectionStartRow >= minLineY) {
         const startLine = lines[selectionStartRow];
-        const startLineStartX = getX(startLine, selectionStartColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, startLineDifference);
-        const startLineEndX = getX(startLine, startLine.length, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, startLineDifference);
+        const startLineStartX = await getX(startLine, selectionStartColumn, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, startLineDifference);
+        const startLineEndX = await getX(startLine, startLine.length, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, startLineDifference);
         const startLineStartY = getY(selectionStartRow, minLineY, rowHeight);
         const selectionWidth = startLineEndX - startLineStartX;
         if (reversed) {
@@ -2712,7 +2719,7 @@ const getVisible = editor => {
         const currentLineY = getY(i, minLineY, rowHeight);
         const relativeLine = i - minLineY;
         const difference = differences[relativeLine];
-        const selectionWidth = getX(currentLine, currentLine.length, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, difference);
+        const selectionWidth = await getX(currentLine, currentLine.length, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, difference);
         visibleSelections.push(0, currentLineY, selectionWidth, rowHeight);
       }
       if (selectionEndRow <= maxLineY) {
@@ -3131,8 +3138,8 @@ const getLanguages = async () => {
   return languages;
 };
 
-const measureCharacterWidth = (fontWeight, fontSize, fontFamily, letterSpacing) => {
-  return measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
+const measureCharacterWidth = async (fontWeight, fontSize, fontFamily, letterSpacing) => {
+  return await measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
 };
 
 const get$1 = async key => {
@@ -3171,7 +3178,7 @@ const getDiagnosticType = diagnostic => {
   return diagnostic.type;
 };
 
-const getVisibleDiagnostics = (editor, diagnostics) => {
+const getVisibleDiagnostics = async (editor, diagnostics) => {
   const visibleDiagnostics = [];
   const {
     width,
@@ -3196,7 +3203,7 @@ const getVisibleDiagnostics = (editor, diagnostics) => {
     const diagnosticWidth = columnDelta * charWidth;
     const endLineDifference = 0;
     const halfCursorWidth = 0;
-    const x = getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
+    const x = await getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
     const y = getY(rowIndex, minLineY, rowHeight) - rowHeight;
     visibleDiagnostics.push({
       x,
@@ -3228,7 +3235,7 @@ const updateDiagnostics = async newState => {
     if (!latest) {
       return newState;
     }
-    const decorations = getVisibleDiagnostics(latest.newState, diagnostics);
+    const decorations = await getVisibleDiagnostics(latest.newState, diagnostics);
     const newEditor = {
       ...latest.newState,
       diagnostics,
@@ -3282,7 +3289,7 @@ const createEditor = async ({
   number(id);
   string(content);
   // TODO support overwriting language id by setting it explicitly or via settings
-  const charWidth = measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing);
+  const charWidth = await measureCharacterWidth(fontWeight, fontSize, fontFamily, letterSpacing);
   const languages = await getLanguages();
   const computedlanguageId = getLanguageId$1(uri, languages);
   const editor = {
@@ -3582,9 +3589,9 @@ const editorReplaceSelections = (editor, replacement, origin) => {
   return replaceRange(editor, selections, replacement, origin);
 };
 
-const getAccurateColumnIndexAscii = (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth) => {
+const getAccurateColumnIndexAscii = async (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth) => {
   for (let i = guess; i < line.length; i++) {
-    const width = measureTextWidth(line.slice(0, i), fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+    const width = await measureTextWidth(line.slice(0, i), fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
     if (eventX - width < averageCharWidth / 2) {
       return i;
     }
@@ -3631,14 +3638,13 @@ const create$8 = () => {
   };
 };
 
-// @ts-ignore
-const getAccurateColumnIndexUnicode = (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing) => {
+const getAccurateColumnIndexUnicode = async (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing) => {
   const segmenter = create$8();
   const segments = segmenter.getSegments(line);
   const isMonospaceFont = false;
   const charWidth = 0;
   for (const segment of segments) {
-    const width = measureTextWidth(line.slice(0, segment.index), fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+    const width = await measureTextWidth(line.slice(0, segment.index), fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
     if (eventX - width < averageCharWidth) {
       return segment.index;
     }
@@ -3651,13 +3657,10 @@ const isAscii = line => {
   return RE_ASCII.test(line);
 };
 
-// @ts-ignore
 const guessOffset = (eventX, averageCharWidth) => {
   const guess = Math.round(eventX / averageCharWidth);
   return guess;
 };
-
-// @ts-ignore
 const normalizeGuess = (line, guess, tabSize) => {
   let normalizedGuess = guess;
   for (let i = 0; i < guess; i++) {
@@ -3667,9 +3670,7 @@ const normalizeGuess = (line, guess, tabSize) => {
   }
   return normalizedGuess;
 };
-
-// @ts-ignore
-const getAccurateColumnIndex = (line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX) => {
+const getAccurateColumnIndex = async (line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX) => {
   string(line);
   number(fontWeight);
   number(fontSize);
@@ -3685,18 +3686,18 @@ const getAccurateColumnIndex = (line, fontWeight, fontSize, fontFamily, letterSp
   const normalizedGuess = normalizeGuess(line, guess, tabSize);
   const text = line.slice(0, normalizedGuess);
   const normalizedText = normalizeText(text, normalize, tabSize);
-  const actual = measureTextWidth(normalizedText, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+  const actual = await measureTextWidth(normalizedText, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
   const isAscii$1 = isAscii(line);
   if (isAscii$1) {
     if (Math.abs(eventX - actual) < charWidth / 2) {
       return normalizedGuess;
     }
-    return getAccurateColumnIndexAscii(line, normalizedGuess, charWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+    return await getAccurateColumnIndexAscii(line, normalizedGuess, charWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
   }
-  return getAccurateColumnIndexUnicode(line, normalizedGuess, charWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing);
+  return await getAccurateColumnIndexUnicode(line, normalizedGuess, charWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing);
 };
 
-const at = (editor, eventX, eventY) => {
+const at = async (editor, eventX, eventY) => {
   object(editor);
   number(eventX);
   number(eventY);
@@ -3722,7 +3723,7 @@ const at = (editor, eventX, eventY) => {
   }
   const clampedRowIndex = clamp(rowIndex, 0, lines.length - 1);
   const line = lines[clampedRowIndex];
-  const columnIndex = getAccurateColumnIndex(line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX);
+  const columnIndex = await getAccurateColumnIndex(line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX);
   return {
     rowIndex: clampedRowIndex,
     columnIndex
@@ -5269,8 +5270,8 @@ const selectWord = (editor, rowIndex, columnIndex) => {
   return scheduleSelections(editor, newSelections);
 };
 
-const handleDoubleClick = (editor, modifier, x, y) => {
-  const position = at(editor, x, y);
+const handleDoubleClick = async (editor, modifier, x, y) => {
+  const position = await at(editor, x, y);
   return selectWord(editor, position.rowIndex, position.columnIndex);
 };
 
@@ -5295,7 +5296,7 @@ const handleSingleClick = async (editor, modifier, x, y) => {
   number(modifier);
   number(x);
   number(y);
-  const position = at(editor, x, y);
+  const position = await at(editor, x, y);
   return handleClickAtPosition(editor, modifier, position.rowIndex, position.columnIndex);
 };
 
@@ -5379,7 +5380,7 @@ const onHoverIdle = async () => {
     y,
     editor
   } = get();
-  at(editor, x, y);
+  await at(editor, x, y);
   await showHover$1();
 };
 const hoverDelay = 300;
@@ -5416,7 +5417,7 @@ const handleMouseMoveWithAltKey = async (editor, x, y) => {
   object(editor);
   number(x);
   number(y);
-  const position = at(editor, x, y);
+  const position = await at(editor, x, y);
   const documentOffset = offsetAt(editor, position.rowIndex, position.columnIndex);
   try {
     const definition = await getDefinition(editor, documentOffset);
@@ -5971,8 +5972,8 @@ const moveRectangleSelection = (editor, position) => {
 };
 
 // @ts-ignore
-const moveRectangleSelectionPx = (editor, x, y) => {
-  at(editor, x, y);
+const moveRectangleSelectionPx = async (editor, x, y) => {
+  await at(editor, x, y);
 };
 
 const LessThan = -1;
@@ -6107,11 +6108,11 @@ const continueScrollingAndMovingSelection = async () => {
 };
 
 // @ts-ignore
-const moveSelectionPx = (editor, x, y) => {
+const moveSelectionPx = async (editor, x, y) => {
   object(editor);
   number(x);
   number(y);
-  const position = at(editor, x, y);
+  const position = await at(editor, x, y);
   if (!hasListener() && (position.rowIndex < editor.minLineY || position.rowIndex > editor.maxLineY)) {
     requestAnimationFrame(continueScrollingAndMovingSelection);
     setEditor(editor);
@@ -6191,7 +6192,7 @@ const create$4 = () => {
 };
 
 const {
-  setFactory,
+  setFactory: setFactory$1,
   invoke: invoke$4
 } = createLazyRpc(CompletionWorker);
 
@@ -9849,7 +9850,7 @@ const launchCompletionWorker = async () => {
 };
 
 const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
-  setFactory(launchCompletionWorker);
+  setFactory$1(launchCompletionWorker);
   await Promise.all([initializeSyntaxHighlighting(syntaxHighlightingEnabled, syncIncremental), initializeExtensionHost()]);
 };
 
@@ -10074,11 +10075,11 @@ const renderSelections = {
   isEqual(oldState, newState) {
     return oldState.selections === newState.selections && oldState.focused === newState.focused && oldState.minLineY === newState.minLineY && oldState.deltaX === newState.deltaX;
   },
-  apply(oldState, newState) {
+  apply: async (oldState, newState) => {
     const {
       cursorInfos,
       selectionInfos
-    } = getVisible(newState);
+    } = await getVisible(newState);
     const cursorsDom = getCursorsVirtualDom(cursorInfos);
     const selectionsDom = getSelectionsVirtualDom(selectionInfos);
     return [/* method */'setSelections', cursorsDom, selectionsDom];
@@ -10219,7 +10220,7 @@ const renderWidgets = {
   multiple: true
 };
 const render$6 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets, renderFocusContext, renderAdditionalFocusContext];
-const renderEditor = id => {
+const renderEditor = async id => {
   const instance = get$5(id);
   if (!instance) {
     return [];
@@ -10232,7 +10233,7 @@ const renderEditor = id => {
   set$6(id, newState, newState);
   for (const item of render$6) {
     if (!item.isEqual(oldState, newState)) {
-      const result = item.apply(oldState, newState);
+      const result = await item.apply(oldState, newState);
       // @ts-ignore
       if (item.multiple) {
         commands.push(...result);
@@ -10361,7 +10362,7 @@ const wrapCommand = fn => async (editorUid, ...args) => {
   // TODO combine neweditor with latest editor?
 
   set$6(editorUid, state, newEditor);
-  const commands = renderEditor(editorUid);
+  const commands = await renderEditor(editorUid);
   return {
     ...newEditor,
     commands
@@ -10617,7 +10618,28 @@ const commandMap = {
 };
 wrapCommands(commandMap);
 
+const send = port => {
+  // @ts-ignore
+  return sendMessagePortToTextMeasurementWorker(port);
+};
+const createTextMeasurementWorkerRpc = async () => {
+  try {
+    const rpc = await TransferMessagePortRpcParent.create({
+      commandMap: {},
+      send
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create text measurement worker rpc`);
+  }
+};
+
+const {
+  setFactory
+} = createLazyRpc(TextMeasurementWorker);
+
 const listen = async () => {
+  setFactory(createTextMeasurementWorkerRpc);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "13.1.0",
+  "version": "13.3.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"