@lvce-editor/editor-worker 2.2.0 → 2.3.0

package/dist/editorWorkerMain.js

@@ -246,7 +246,6 @@ const Tab = '\t';
 const Underline = '_';
 const T = 't';
 
-// @ts-ignore
 const getFontString = (fontWeight, fontSize, fontFamily) => {
   return `${fontWeight} ${fontSize}px ${fontFamily}`;
 };
@@ -255,14 +254,18 @@ const getLetterSpacingString = letterSpacing => {
   return `${letterSpacing}px`;
 };
 
+const createMeasureContext = () => {
+  const canvas = new OffscreenCanvas(0, 0);
+  const ctx = /** @type {OffscreenCanvasRenderingContext2D} */canvas.getContext('2d');
+  if (!ctx) {
+    throw new Error('Failed to get canvas context 2d');
+  }
+  return ctx;
+};
+
 const state$b = {
   ctx: undefined
 };
-
-/**
- * @param {()=>OffscreenCanvasRenderingContext2D} createCtx
- * @returns {OffscreenCanvasRenderingContext2D}
- */
 const getOrCreate = createCtx => {
   if (state$b.ctx) {
     return state$b.ctx;
@@ -271,16 +274,8 @@ const getOrCreate = createCtx => {
   return state$b.ctx;
 };
 
-const createCtx = () => {
-  const canvas = new OffscreenCanvas(0, 0);
-  const ctx = /** @type {OffscreenCanvasRenderingContext2D} */canvas.getContext('2d');
-  if (!ctx) {
-    throw new Error('Failed to get canvas context 2d');
-  }
-  return ctx;
-};
 const getContext = () => {
-  const ctx = getOrCreate(createCtx);
+  const ctx = getOrCreate(createMeasureContext);
   return ctx;
 };
 
@@ -454,7 +449,6 @@ const getAccurateColumnIndex = (line, fontWeight, fontSize, fontFamily, letterSp
   return getAccurateColumnIndexUnicode(line, normalizedGuess, charWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing);
 };
 
-// @ts-ignore
 const at = (editor, eventX, eventY) => {
   object(editor);
   number$1(eventX);
@@ -498,7 +492,6 @@ const at = (editor, eventX, eventY) => {
  * @param {number} columnIndex
  * @returns
  */
-// @ts-ignore
 const x = (editor, rowIndex, columnIndex) => {
   const {
     columnWidth,
@@ -507,8 +500,6 @@ const x = (editor, rowIndex, columnIndex) => {
   const offsetX = columnIndex * columnWidth + x;
   return offsetX;
 };
-
-// @ts-ignore
 const y = (editor, rowIndex) => {
   const {
     rowHeight,
@@ -740,8 +731,8 @@ const SymbolDefault = 'SymbolDefault';
 const SymbolField = 'SymbolField';
 const SymbolNone = '';
 
-const getSymbolName = item => {
-  switch (item.kind) {
+const getSymbolName = kind => {
+  switch (kind) {
     case Property:
       return SymbolProperty;
     case Value:
@@ -788,7 +779,7 @@ const getFileIcon = item => {
 const getVisibleIem = (item, itemHeight, leadingWord, i, focusedIndex) => {
   return {
     label: getLabel(item),
-    symbolName: getSymbolName(item),
+    symbolName: getSymbolName(item.kind),
     top: i * itemHeight,
     highlights: getHighlights(item),
     focused: i === focusedIndex,
@@ -1029,8 +1020,6 @@ const traceHighlights = (table, arrows, patternLength, wordLength) => {
 const gridSize = 128;
 const table = createTable(gridSize);
 const arrows = createTable(gridSize);
-// @ts-ignore
-createTable(gridSize);
 const filterCompletionItem = (pattern, word) => {
   const patternLength = Math.min(pattern.length, gridSize - 1);
   const wordLength = Math.min(word.length, gridSize - 1);
@@ -1069,7 +1058,6 @@ const filterCompletionItem = (pattern, word) => {
   if (!strongMatch) {
     return EmptyMatches;
   }
-  // printTables(pattern, 0, word, 0)
   const highlights = traceHighlights(table, arrows, patternLength, wordLength);
   return highlights;
 };
@@ -1121,13 +1109,9 @@ const getListHeight = (itemsLength, itemHeight, maxHeight) => {
   return Math.min(totalHeight, maxHeight);
 };
 
-const RE_WORD_START$1 = /^\w+/;
-const RE_WORD_END$1 = /\w+$/;
-const getWordAt = (editor, rowIndex, columnIndex) => {
-  const {
-    lines
-  } = editor;
-  const line = lines[rowIndex];
+const RE_WORD_START$1 = /^[\w\-]+/;
+const RE_WORD_END$1 = /[\w\-]+$/;
+const getWordAt$1 = (line, columnIndex) => {
   const before = line.slice(0, columnIndex);
   const matchBefore = before.match(RE_WORD_END$1);
   const after = line.slice(columnIndex);
@@ -1143,11 +1127,7 @@ const getWordAt = (editor, rowIndex, columnIndex) => {
     word
   };
 };
-const getWordBefore = (editor, rowIndex, columnIndex) => {
-  const {
-    lines
-  } = editor;
-  const line = lines[rowIndex];
+const getWordBefore$1 = (line, columnIndex) => {
   const before = line.slice(0, columnIndex);
   const matchBefore = before.match(RE_WORD_END$1);
   if (matchBefore) {
@@ -1156,6 +1136,21 @@ const getWordBefore = (editor, rowIndex, columnIndex) => {
   return EmptyString;
 };
 
+const getWordAt = (editor, rowIndex, columnIndex) => {
+  const {
+    lines
+  } = editor;
+  const line = lines[rowIndex];
+  return getWordAt$1(line, columnIndex);
+};
+const getWordBefore = (editor, rowIndex, columnIndex) => {
+  const {
+    lines
+  } = editor;
+  const line = lines[rowIndex];
+  return getWordBefore$1(line, columnIndex);
+};
+
 const render$2 = (oldState, newState) => {
   const commands = renderCompletion(oldState, newState);
   const wrappedCommands = [];
@@ -1225,7 +1220,7 @@ const handleEditorDeleteLeft$1 = (editor, state) => {
   const y$1 = y(editor, rowIndex);
   const wordAtOffset = getWordBefore(editor, rowIndex, columnIndex);
   if (!wordAtOffset) {
-    return state;
+    return undefined;
   }
   const items = filterCompletionItems(unfilteredItems, wordAtOffset);
   const newMaxLineY = Math.min(items.length, 8);
@@ -1252,13 +1247,16 @@ const EditorCompletionWidget = {
 
 const Completion = 'completion';
 
+const modules = Object.create(null);
+const register = (id, value) => {
+  modules[id] = value;
+};
+const get$7 = id => {
+  return modules[id];
+};
+
 const getModule$2 = id => {
-  switch (id) {
-    case Completion:
-      return EditorCompletionWidget;
-    default:
-      throw new Error('unsupported widget');
-  }
+  return get$7(id);
 };
 
 const applyWidgetChange = (editor, widget, changes) => {
@@ -1285,10 +1283,13 @@ const applyWidgetChanges = (editor, changes) => {
   if (widgets.length === 0) {
     return widgets;
   }
-  const newWidgets = widgets.map(widget => {
+  const newWidgets = [];
+  for (const widget of widgets) {
     const newWidget = applyWidgetChange(editor, widget, changes);
-    return newWidget;
-  });
+    if (newWidget.newState) {
+      newWidgets.push(newWidget);
+    }
+  }
   return newWidgets;
 };
 
@@ -1482,8 +1483,7 @@ const positionAt = (textDocument, offset) => {
 };
 
 // TODO this should be in a separate scrolling module
-// @ts-ignore
-const setDeltaY$3 = (state, value) => {
+const setDeltaY$2 = (state, value) => {
   object(state);
   number$1(value);
   const {
@@ -1521,17 +1521,19 @@ const getSelectionPairs = (selections, i) => {
   return [first, second, third, fourth, 0];
 };
 
-// TODO visible selections could also be uint16array
-// [top1, left1, width1, height1, top2, left2, width2, height2...]
 const getTabCount = string => {
   let count = 0;
   for (const element of string) {
-    if (element === '\t') {
+    if (element === Tab) {
       count++;
     }
   }
   return count;
 };
+
+// TODO visible selections could also be uint16array
+// [top1, left1, width1, height1, top2, left2, width2, height2...]
+
 const getX = (line, column, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, averageCharWidth, difference = 0) => {
   if (!line) {
     return 0;
@@ -1643,6 +1645,9 @@ const push = (selections, startRowIndex, startColumnIndex, endRowIndex, endColum
   newSelections[oldLength + 4] = endColumnIndex;
   return newSelections;
 };
+
+// TODO maybe only accept sorted selection edits in the first place
+
 const emptyCursors = [];
 const getCursorArray = (visibleCursors, isFocused) => {
   if (!isFocused) {
@@ -1808,9 +1813,9 @@ const applyEdit$1 = (editor, changes) => {
 
 // TODO
 const setDeltaYFixedValue$1 = (editor, value) => {
-  return setDeltaY$3(editor, value);
+  return setDeltaY$2(editor, value);
 };
-const setDeltaY$2 = (editor, value) => {
+const setDeltaY$1 = (editor, value) => {
   return setDeltaYFixedValue$1(editor, editor.deltaY + value);
 };
 const isAutoClosingChange = change => {
@@ -2018,34 +2023,6 @@ const set$6 = (id, oldEditor, newEditor) => {
   };
 };
 
-// TODO this should be in a separate scrolling module
-const setDeltaY$1 = (state, value) => {
-  object(state);
-  number$1(value);
-  const {
-    finalDeltaY,
-    deltaY,
-    numberOfVisibleLines,
-    height,
-    scrollBarHeight,
-    itemHeight
-  } = state;
-  const newDeltaY = clamp(value, 0, finalDeltaY);
-  if (deltaY === newDeltaY) {
-    return state;
-  }
-  const newMinLineY = Math.floor(newDeltaY / itemHeight);
-  const newMaxLineY = newMinLineY + numberOfVisibleLines;
-  const scrollBarY = getScrollBarY(newDeltaY, finalDeltaY, height, scrollBarHeight);
-  return {
-    ...state,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
-    deltaY: newDeltaY,
-    scrollBarY
-  };
-};
-
 const Two = '2.0';
 class AssertionError extends Error {
   constructor(message) {
@@ -2160,7 +2137,7 @@ class JsonRpcError extends Error {
     this.name = 'JsonRpcError';
   }
 }
-const NewLine$2 = '\n';
+const NewLine$3 = '\n';
 const DomException = 'DOMException';
 const ReferenceError$1 = 'ReferenceError';
 const SyntaxError$1 = 'SyntaxError';
@@ -2208,20 +2185,20 @@ const constructError = (message, type, name) => {
   return new ErrorConstructor(message);
 };
 const getNewLineIndex$2 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$2, startIndex);
+  return string.indexOf(NewLine$3, startIndex);
 };
 const joinLines$1 = lines => {
-  return lines.join(NewLine$2);
+  return lines.join(NewLine$3);
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
 const splitLines$1 = lines => {
-  return lines.split(NewLine$2);
+  return lines.split(NewLine$3);
 };
 const getParentStack = error => {
   let parentStack = error.stack || error.data || error.message || '';
   if (parentStack.startsWith('    at')) {
-    parentStack = error.message + NewLine$2 + parentStack;
+    parentStack = error.message + NewLine$3 + parentStack;
   }
   return parentStack;
 };
@@ -2233,14 +2210,14 @@ const restoreJsonRpcError = error => {
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine$2 + currentStack;
+    restoredError.stack = parentStack + NewLine$3 + currentStack;
     return restoredError;
   }
   if (error && error.message) {
     const restoredError = constructError(error.message, error.type, error.name);
     if (error.data) {
       if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine$2 + error.data.stack + NewLine$2 + currentStack;
+        restoredError.stack = error.data.type + ': ' + error.message + NewLine$3 + error.data.stack + NewLine$3 + currentStack;
       } else if (error.data.stack) {
         restoredError.stack = error.data.stack;
       }
@@ -2856,7 +2833,7 @@ const createEditor = async ({
   // TODO avoid creating intermediate editors here
   const newEditor1 = setBounds(editor, x, y, width, height, 9);
   const newEditor2 = setText(newEditor1, content);
-  const newEditor3 = setDeltaY$1(newEditor2, 0);
+  const newEditor3 = setDeltaY$2(newEditor2, 0);
   const newEditor4 = {
     ...newEditor3,
     focused: true
@@ -3084,7 +3061,7 @@ const cancelSelection = editor => {
 };
 
 const isCompletionWidget = widget => {
-  return widget.id === 'completion';
+  return widget.id === Completion;
 };
 const closeCompletion = editor => {
   const {
@@ -3156,17 +3133,6 @@ const compositionEnd = (editor, data) => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-/**
- *
- * @param {string} string
- * @param {number|undefined} startIndex
- * @returns
- */
-// @ts-ignore
-const getNewLineIndex$1 = (string, startIndex = undefined) => {
-  return string.indexOf('\n', startIndex);
-};
-
 const normalizeLine$1 = line => {
   if (line.startsWith('Error: ')) {
     return line.slice(`Error: `.length);
@@ -3176,7 +3142,17 @@ const normalizeLine$1 = line => {
   }
   return line;
 };
-
+const getCombinedMessage$1 = (error, message) => {
+  const stringifiedError = normalizeLine$1(`${error}`);
+  if (message) {
+    return `${message}: ${stringifiedError}`;
+  }
+  return stringifiedError;
+};
+const NewLine$2 = '\n';
+const getNewLineIndex$1 = (string, startIndex = undefined) => {
+  return string.indexOf(NewLine$2, startIndex);
+};
 const mergeStacks$1 = (parent, child) => {
   if (!child) {
     return parent;
@@ -3194,28 +3170,6 @@ const mergeStacks$1 = (parent, child) => {
   }
   return child;
 };
-
-// @ts-nocheck
-const stringifyError = error => {
-  if (error instanceof DOMException && error.message) {
-    return `DOMException: ${error.message}`;
-  }
-  const errorPrefixes = ['Error: ', 'VError: '];
-  const stringifiedError = `${error}`;
-  for (const errorPrefix of errorPrefixes) {
-    if (stringifiedError.startsWith(errorPrefix)) {
-      return stringifiedError.slice(errorPrefix.length);
-    }
-  }
-  return stringifiedError;
-};
-const getCombinedMessage$1 = (error, message) => {
-  const stringifiedError = stringifyError(error);
-  if (message) {
-    return `${message}: ${stringifiedError}`;
-  }
-  return `${stringifiedError}`;
-};
 let VError$1 = class VError extends Error {
   constructor(error, message) {
     const combinedMessage = getCombinedMessage$1(error, message);
@@ -3225,12 +3179,16 @@ let VError$1 = class VError extends Error {
       this.stack = mergeStacks$1(this.stack, error.stack);
     }
     if (error.codeFrame) {
+      // @ts-ignore
       this.codeFrame = error.codeFrame;
     }
+    if (error.code) {
+      // @ts-ignore
+      this.code = error.code;
+    }
   }
 };
 
-// @ts-ignore
 const writeText = async text => {
   try {
     string(text);
@@ -3647,9 +3605,6 @@ const cursorSet = (editor, rowIndex, columnIndex) => {
   return scheduleSelections(editor, selectionEdits);
 };
 
-// @ts-ignore
-
-// @ts-ignore
 const moveSelectionWithoutIntlSegmenter = (selections, i, selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) => {
   if (selectionStartRow === 0) {
     moveRangeToPosition$1(selections, i, 0, 0);
@@ -3657,13 +3612,9 @@ const moveSelectionWithoutIntlSegmenter = (selections, i, selectionStartRow, sel
     moveRangeToPosition$1(selections, i, selectionStartRow - 1, selectionStartColumn);
   }
 };
-
-// @ts-ignore
 const getNewSelections$8 = selections => {
   return map(selections, moveSelectionWithoutIntlSegmenter);
 };
-
-// @ts-ignore
 const cursorVertical = (editor, getPosition, getEdgePosition, delta) => {
   // if (TextSegmenter.supported()) {
   //   return editorCursorsVerticalWithIntlSegmenter(
@@ -3679,7 +3630,6 @@ const cursorVertical = (editor, getPosition, getEdgePosition, delta) => {
   return scheduleSelections(editor, newSelections);
 };
 
-// @ts-ignore
 const cursorUp = editor => {
   return cursorVertical(editor);
 };
@@ -3707,7 +3657,6 @@ const cursorWordRight = editor => {
   return editorCursorHorizontalRight(editor, wordRight);
 };
 
-// @ts-ignore
 const cutLine = async editor => {
   const {
     lines,
@@ -3719,7 +3668,6 @@ const cutLine = async editor => {
   const changes = replaceRange(editor, replaceRange$1, [''], EditorCut);
   const selectionChanges = new Uint32Array([startRowIndex, 0, startRowIndex, 0]);
   await writeText(line);
-  // @ts-ignore
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
@@ -3739,7 +3687,6 @@ const cutSelectedText = async editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
-// @ts-ignore
 const cut = editor => {
   const {
     selections
@@ -4834,7 +4781,7 @@ const handleTouchEnd = (editor, touchEvent) => {
 
 // @ts-ignore
 const setDeltaY = (editor, deltaY) => {
-  return setDeltaY$2(editor, deltaY);
+  return setDeltaY$1(editor, deltaY);
 };
 
 // @ts-ignore
@@ -5242,12 +5189,6 @@ const resolveCompletion = async (editor, name, completionItem) => {
 
 const None = 1;
 
-const getFinalDeltaY = (height, itemHeight, itemsLength) => {
-  const contentHeight = itemsLength * itemHeight;
-  const finalDeltaY = Math.max(contentHeight - height, 0);
-  return finalDeltaY;
-};
-
 const getEditor = editorUid => {
   const instance = get$6(editorUid);
   if (!instance) {
@@ -5259,6 +5200,12 @@ const getEditor = editorUid => {
   return newState;
 };
 
+const getFinalDeltaY = (height, itemHeight, itemsLength) => {
+  const contentHeight = itemsLength * itemHeight;
+  const finalDeltaY = Math.max(contentHeight - height, 0);
+  return finalDeltaY;
+};
+
 const RE_WORD = /[\w\-]+$/;
 const getWordAtOffset = editor => {
   const {
@@ -5399,14 +5346,26 @@ const advance = (state, word) => {
   };
 };
 
+const hasWidget = (widgets, id) => {
+  for (const widget of widgets) {
+    if (widget.id === id) {
+      return true;
+    }
+  }
+  return false;
+};
+
 const openCompletion = async editor => {
   const {
     widgets,
     uid
   } = editor;
+  if (hasWidget(widgets, Completion)) {
+    return editor;
+  }
   const completionUid = Math.random();
   const completionWidget = {
-    id: 'completion',
+    id: Completion,
     oldState: {
       items: [],
       itemHeight: 20,
@@ -6377,7 +6336,6 @@ const showSourceActions = async editor => {
   return editor;
 };
 
-// @ts-ignore
 const compareString = (a, b) => {
   return a.localeCompare(b);
 };
@@ -7162,7 +7120,7 @@ const editorUnindent = editor => {
 // editor.lines //?
 
 const isCompletion$2 = widget => {
-  return widget.id === 'completion';
+  return widget.id === Completion;
 };
 const getCompletionState = editor => {
   const {
@@ -7173,7 +7131,7 @@ const getCompletionState = editor => {
 };
 
 const isCompletion$1 = widget => {
-  return widget.id === 'completion';
+  return widget.id === Completion;
 };
 const focusIndex$1 = (editor, index) => {
   const child = getCompletionState(editor);
@@ -7236,7 +7194,7 @@ const getEdits = async (editor, completionItem) => {
   return changes;
 };
 const isCompletion = widget => {
-  return widget.id === 'completion';
+  return widget.id === Completion;
 };
 const select = async (editor, completionItem) => {
   const changes = await getEdits(editor, completionItem);
@@ -9381,6 +9339,7 @@ const listen$1 = async ({
 
 const listen = async () => {
   registerCommands(commandMap);
+  register(Completion, EditorCompletionWidget);
   const ipc = await listen$1({
     method: Auto()
   });

package/package.json

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