@lvce-editor/editor-worker 16.9.0 → 16.10.0

package/dist/editorWorkerMain.js

@@ -11293,33 +11293,6 @@ const updateDebugInfo = async debugId => {
   await invoke$d('Editor.rerender', key);
 };
 
-const keep = ['ActivateByEvent.activateByEvent', 'ExtensionHostManagement.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getSourceActions', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getOffsetAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.hotReload', 'Editor.getSelections2', 'Editor.getDiagnostics', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getUri', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Editor.getLanguageId', 'Editor.getProblems', 'Editor.getKeys', 'Editor.getMenuIds', 'Editor.getMenuEntries', 'Editor.getMenuEntries2', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
-// 'ColorPicker.handleSliderPointerDown',
-// 'ColorPicker.handleSliderPointerMove',
-// 'ColorPicker.loadContent',
-// 'ColorPicker.render',
-];
-
-const wrapWidgetCommand = (widgetId, fn) => {
-  const isWidget = widget => {
-    return widget.id === widgetId;
-  };
-  const wrapped = async (editor, ...args) => {
-    const childIndex = editor.widgets.findIndex(isWidget);
-    // TODO scroll up/down if necessary
-    const childWidget = editor.widgets[childIndex];
-    const newState = await fn(childWidget.newState, ...args);
-    const newEditor = updateWidget(editor, widgetId, newState);
-    return newEditor;
-  };
-  return wrapped;
-};
-
-const widgetCommands = {
-  'ColorPicker.handleSliderPointerDown': ColorPicker$1,
-  'ColorPicker.handleSliderPointerMove': ColorPicker$1
-};
-
 // TODO wrap commands globally, not per editor
 // TODO only store editor state in editor worker, not in renderer worker also
 
@@ -11341,72 +11314,61 @@ const wrapCommand = fn => async (editorUid, ...args) => {
     commands
   };
 };
-const wrapCommands = commands => {
-  for (const [key, value] of Object.entries(commands)) {
-    if (keep.includes(key)) {
-      continue;
-    }
-    // TODO avoid wrapping functions twice
-    const innerWrappedWidgetId = widgetCommands[key];
-    const innerWrappedFn = innerWrappedWidgetId ? wrapWidgetCommand(innerWrappedWidgetId, value) : value;
-    commands[key] = wrapCommand(innerWrappedFn);
-  }
-};
 
 const commandMap = {
   'ActivateByEvent.activateByEvent': activateByEvent,
   'CodeGenerator.accept': codeGeneratorAccept,
   'ColorPicker.loadContent': loadContent$2,
-  'Editor.addCursorAbove': addCursorAbove,
-  'Editor.addCursorBelow': addCursorBelow,
-  'Editor.applyDocumentEdits': applyDocumentEdits,
-  'Editor.applyEdit': applyEdit,
+  'Editor.addCursorAbove': wrapCommand(addCursorAbove),
+  'Editor.addCursorBelow': wrapCommand(addCursorBelow),
+  'Editor.applyDocumentEdits': wrapCommand(applyDocumentEdits),
+  'Editor.applyEdit': wrapCommand(applyEdit),
   'Editor.applyEdit2': applyEdits2,
-  'Editor.applyWorkspaceEdit': applyWorkspaceEdit,
-  'Editor.braceCompletion': braceCompletion,
-  'Editor.cancelSelection': cancelSelection,
-  'Editor.closeCodeGenerator': closeCodeGenerator,
-  'Editor.closeFind': closeFind,
+  'Editor.applyWorkspaceEdit': wrapCommand(applyWorkspaceEdit),
+  'Editor.braceCompletion': wrapCommand(braceCompletion),
+  'Editor.cancelSelection': wrapCommand(cancelSelection),
+  'Editor.closeCodeGenerator': wrapCommand(closeCodeGenerator),
+  'Editor.closeFind': wrapCommand(closeFind),
   'Editor.closeFind2': closeFind2,
-  'Editor.closeRename': closeRename,
-  'Editor.closeSourceAction': closeSourceAction,
+  'Editor.closeRename': wrapCommand(closeRename),
+  'Editor.closeSourceAction': wrapCommand(closeSourceAction),
   'Editor.closeWidget2': closeWidget2,
-  'Editor.compositionEnd': compositionEnd,
-  'Editor.compositionStart': compositionStart,
-  'Editor.compositionUpdate': compositionUpdate,
-  'Editor.contextMenu': handleContextMenu,
-  'Editor.copy': copy$1,
-  'Editor.copyLineDown': copyLineDown,
-  'Editor.copyLineUp': copyLineUp,
+  'Editor.compositionEnd': wrapCommand(compositionEnd),
+  'Editor.compositionStart': wrapCommand(compositionStart),
+  'Editor.compositionUpdate': wrapCommand(compositionUpdate),
+  'Editor.contextMenu': wrapCommand(handleContextMenu),
+  'Editor.copy': wrapCommand(copy$1),
+  'Editor.copyLineDown': wrapCommand(copyLineDown),
+  'Editor.copyLineUp': wrapCommand(copyLineUp),
   'Editor.create': createEditor,
-  'Editor.cursorCharacterLeft': cursorCharacterLeft,
-  'Editor.cursorCharacterRight': cursorCharacterRight,
-  'Editor.cursorDown': cursorDown,
-  'Editor.cursorEnd': cursorEnd,
-  'Editor.cursorHome': cursorHome,
-  'Editor.cursorLeft': cursorCharacterLeft,
-  'Editor.cursorRight': cursorCharacterRight,
-  'Editor.cursorSet': cursorSet,
-  'Editor.cursorUp': cursorUp,
-  'Editor.cursorWordLeft': cursorWordLeft,
-  'Editor.cursorWordPartLeft': cursorWordPartLeft,
-  'Editor.cursorWordPartRight': cursorWordPartRight,
-  'Editor.cursorWordRight': cursorWordRight,
-  'Editor.cut': cut$1,
-  'Editor.deleteAllLeft': deleteAllLeft,
-  'Editor.deleteAllRight': deleteAllRight,
-  'Editor.deleteCharacterLeft': deleteCharacterLeft,
-  'Editor.deleteCharacterRight': deleteCharacterRight,
-  'Editor.deleteHorizontalRight': editorDeleteHorizontalRight,
-  'Editor.deleteLeft': deleteCharacterLeft,
-  'Editor.deleteRight': deleteCharacterRight,
-  'Editor.deleteWordLeft': deleteWordLeft,
-  'Editor.deleteWordPartLeft': deleteWordPartLeft,
-  'Editor.deleteWordPartRight': deleteWordPartRight,
-  'Editor.deleteWordRight': deleteWordRight,
-  'Editor.executeWidgetCommand': executeWidgetCommand,
-  'Editor.findAllReferences': findAllReferences$1,
-  'Editor.format': format,
+  'Editor.cursorCharacterLeft': wrapCommand(cursorCharacterLeft),
+  'Editor.cursorCharacterRight': wrapCommand(cursorCharacterRight),
+  'Editor.cursorDown': wrapCommand(cursorDown),
+  'Editor.cursorEnd': wrapCommand(cursorEnd),
+  'Editor.cursorHome': wrapCommand(cursorHome),
+  'Editor.cursorLeft': wrapCommand(cursorCharacterLeft),
+  'Editor.cursorRight': wrapCommand(cursorCharacterRight),
+  'Editor.cursorSet': wrapCommand(cursorSet),
+  'Editor.cursorUp': wrapCommand(cursorUp),
+  'Editor.cursorWordLeft': wrapCommand(cursorWordLeft),
+  'Editor.cursorWordPartLeft': wrapCommand(cursorWordPartLeft),
+  'Editor.cursorWordPartRight': wrapCommand(cursorWordPartRight),
+  'Editor.cursorWordRight': wrapCommand(cursorWordRight),
+  'Editor.cut': wrapCommand(cut$1),
+  'Editor.deleteAllLeft': wrapCommand(deleteAllLeft),
+  'Editor.deleteAllRight': wrapCommand(deleteAllRight),
+  'Editor.deleteCharacterLeft': wrapCommand(deleteCharacterLeft),
+  'Editor.deleteCharacterRight': wrapCommand(deleteCharacterRight),
+  'Editor.deleteHorizontalRight': wrapCommand(editorDeleteHorizontalRight),
+  'Editor.deleteLeft': wrapCommand(deleteCharacterLeft),
+  'Editor.deleteRight': wrapCommand(deleteCharacterRight),
+  'Editor.deleteWordLeft': wrapCommand(deleteWordLeft),
+  'Editor.deleteWordPartLeft': wrapCommand(deleteWordPartLeft),
+  'Editor.deleteWordPartRight': wrapCommand(deleteWordPartRight),
+  'Editor.deleteWordRight': wrapCommand(deleteWordRight),
+  'Editor.executeWidgetCommand': wrapCommand(executeWidgetCommand),
+  'Editor.findAllReferences': wrapCommand(findAllReferences$1),
+  'Editor.format': wrapCommand(format),
   'Editor.getDiagnostics': getDiagnostics$1,
   'Editor.getKeyBindings': getKeyBindings,
   'Editor.getKeys': getKeys,
@@ -11429,98 +11391,98 @@ const commandMap = {
   'Editor.getWordAtOffset2': getWordAtOffset2,
   'Editor.getWordBefore': getWordBefore,
   'Editor.getWordBefore2': getWordBefore2,
-  'Editor.goToDefinition': goToDefinition,
-  'Editor.goToTypeDefinition': goToTypeDefinition,
-  'Editor.handleBeforeInput': handleBeforeInput,
-  'Editor.handleBeforeInputFromContentEditable': handleBeforeInputFromContentEditable,
-  'Editor.handleBlur': handleBlur$1,
+  'Editor.goToDefinition': wrapCommand(goToDefinition),
+  'Editor.goToTypeDefinition': wrapCommand(goToTypeDefinition),
+  'Editor.handleBeforeInput': wrapCommand(handleBeforeInput),
+  'Editor.handleBeforeInputFromContentEditable': wrapCommand(handleBeforeInputFromContentEditable),
+  'Editor.handleBlur': wrapCommand(handleBlur$1),
   'Editor.handleClickAtPosition': handleClickAtPosition,
-  'Editor.handleContextMenu': handleContextMenu,
-  'Editor.handleDoubleClick': handleDoubleClick,
-  'Editor.handleFocus': handleFocus$1,
-  'Editor.handleMouseDown': handleMouseDown,
-  'Editor.handleMouseMove': handleMouseMove,
-  'Editor.handleMouseMoveWithAltKey': handleMouseMoveWithAltKey,
+  'Editor.handleContextMenu': wrapCommand(handleContextMenu),
+  'Editor.handleDoubleClick': wrapCommand(handleDoubleClick),
+  'Editor.handleFocus': wrapCommand(handleFocus$1),
+  'Editor.handleMouseDown': wrapCommand(handleMouseDown),
+  'Editor.handleMouseMove': wrapCommand(handleMouseMove),
+  'Editor.handleMouseMoveWithAltKey': wrapCommand(handleMouseMoveWithAltKey),
   'Editor.handleNativeSelectionChange': editorHandleNativeSelectionChange,
-  'Editor.handlePointerCaptureLost': handlePointerCaptureLost,
+  'Editor.handlePointerCaptureLost': wrapCommand(handlePointerCaptureLost),
   'Editor.handleScrollBarClick': handleScrollBarPointerDown,
-  'Editor.handleScrollBarHorizontalMove': handleScrollBarHorizontalMove,
-  'Editor.handleScrollBarHorizontalPointerDown': handleScrollBarHorizontalPointerDown,
-  'Editor.handleScrollBarMove': handleScrollBarMove,
-  'Editor.handleScrollBarPointerDown': handleScrollBarPointerDown,
-  'Editor.handleScrollBarVerticalMove': handleScrollBarVerticalPointerMove,
-  'Editor.handleScrollBarVerticalPointerDown': handleScrollBarPointerDown,
-  'Editor.handleScrollBarVerticalPointerMove': handleScrollBarVerticalPointerMove,
-  'Editor.handleSingleClick': handleSingleClick,
-  'Editor.handleTab': handleTab,
-  'Editor.handleTouchEnd': handleTouchEnd,
-  'Editor.handleTouchMove': handleTouchMove,
-  'Editor.handleTouchStart': handleTouchStart,
-  'Editor.handleTripleClick': handleTripleClick,
+  'Editor.handleScrollBarHorizontalMove': wrapCommand(handleScrollBarHorizontalMove),
+  'Editor.handleScrollBarHorizontalPointerDown': wrapCommand(handleScrollBarHorizontalPointerDown),
+  'Editor.handleScrollBarMove': wrapCommand(handleScrollBarMove),
+  'Editor.handleScrollBarPointerDown': wrapCommand(handleScrollBarPointerDown),
+  'Editor.handleScrollBarVerticalMove': wrapCommand(handleScrollBarVerticalPointerMove),
+  'Editor.handleScrollBarVerticalPointerDown': wrapCommand(handleScrollBarPointerDown),
+  'Editor.handleScrollBarVerticalPointerMove': wrapCommand(handleScrollBarVerticalPointerMove),
+  'Editor.handleSingleClick': wrapCommand(handleSingleClick),
+  'Editor.handleTab': wrapCommand(handleTab),
+  'Editor.handleTouchEnd': wrapCommand(handleTouchEnd),
+  'Editor.handleTouchMove': wrapCommand(handleTouchMove),
+  'Editor.handleTouchStart': wrapCommand(handleTouchStart),
+  'Editor.handleTripleClick': wrapCommand(handleTripleClick),
   'Editor.hotReload': hotReload,
-  'Editor.indendLess': indentLess,
-  'Editor.indentMore': indentMore,
-  'Editor.insertLineBreak': insertLineBreak,
-  'Editor.moveLineDown': moveLineDown,
-  'Editor.moveLineUp': moveLineUp,
-  'Editor.moveRectangleSelection': moveRectangleSelection,
-  'Editor.moveRectangleSelectionPx': moveRectangleSelectionPx,
-  'Editor.moveSelection': editorMoveSelection,
-  'Editor.moveSelectionPx': moveSelectionPx,
+  'Editor.indendLess': wrapCommand(indentLess),
+  'Editor.indentMore': wrapCommand(indentMore),
+  'Editor.insertLineBreak': wrapCommand(insertLineBreak),
+  'Editor.moveLineDown': wrapCommand(moveLineDown),
+  'Editor.moveLineUp': wrapCommand(moveLineUp),
+  'Editor.moveRectangleSelection': wrapCommand(moveRectangleSelection),
+  'Editor.moveRectangleSelectionPx': wrapCommand(moveRectangleSelectionPx),
+  'Editor.moveSelection': wrapCommand(editorMoveSelection),
+  'Editor.moveSelectionPx': wrapCommand(moveSelectionPx),
   'Editor.offsetAt': offsetAt,
-  'Editor.openCodeGenerator': openCodeGenerator,
-  'Editor.openColorPicker': openColorPicker,
-  'Editor.openCompletion': openCompletion,
-  'Editor.openFind': openFind,
-  'Editor.openFind2': openFind2,
-  'Editor.openRename': openRename,
-  'Editor.organizeImports': organizeImports,
-  'Editor.paste': paste,
-  'Editor.pasteText': pasteText,
+  'Editor.openCodeGenerator': wrapCommand(openCodeGenerator),
+  'Editor.openColorPicker': wrapCommand(openColorPicker),
+  'Editor.openCompletion': wrapCommand(openCompletion),
+  'Editor.openFind': wrapCommand(openFind),
+  'Editor.openFind2': wrapCommand(openFind2),
+  'Editor.openRename': wrapCommand(openRename),
+  'Editor.organizeImports': wrapCommand(organizeImports),
+  'Editor.paste': wrapCommand(paste),
+  'Editor.pasteText': wrapCommand(pasteText),
   'Editor.render': renderEditor,
   'Editor.renderEventListeners': renderEventListeners,
-  'Editor.replaceRange': replaceRange,
-  'Editor.rerender': rerender,
-  'Editor.save': save,
-  'Editor.selectAll': selectAll,
-  'Editor.selectAllLeft': editorSelectAllLeft,
-  'Editor.selectAllOccurrences': selectAllOccurrences,
-  'Editor.selectAllRight': editorSelectAllRight,
-  'Editor.selectCharacterLeft': selectCharacterLeft,
-  'Editor.selectCharacterRight': selectCharacterRight,
-  'Editor.selectDown': selectDown,
-  'Editor.selectInsideString': selectInsideString,
-  'Editor.selectionGrow': selectionGrow,
-  'Editor.selectLine': selectLine,
-  'Editor.selectNextOccurrence': selectNextOccurrence,
-  'Editor.selectPreviousOccurrence': selectPreviousOccurrence,
-  'Editor.selectUp': selectUp,
-  'Editor.selectWord': selectWord,
-  'Editor.selectWordLeft': selectWordLeft,
-  'Editor.selectWordRight': selectWordRight,
-  'Editor.setDebugEnabled': setDebugEnabled,
-  'Editor.setDecorations': setDecorations,
-  'Editor.setDelta': setDelta,
-  'Editor.setDeltaY': setDeltaY,
-  'Editor.setLanguageId': setLanguageId,
-  'Editor.setSelections': setSelections,
+  'Editor.replaceRange': wrapCommand(replaceRange),
+  'Editor.rerender': wrapCommand(rerender),
+  'Editor.save': wrapCommand(save),
+  'Editor.selectAll': wrapCommand(selectAll),
+  'Editor.selectAllLeft': wrapCommand(editorSelectAllLeft),
+  'Editor.selectAllOccurrences': wrapCommand(selectAllOccurrences),
+  'Editor.selectAllRight': wrapCommand(editorSelectAllRight),
+  'Editor.selectCharacterLeft': wrapCommand(selectCharacterLeft),
+  'Editor.selectCharacterRight': wrapCommand(selectCharacterRight),
+  'Editor.selectDown': wrapCommand(selectDown),
+  'Editor.selectInsideString': wrapCommand(selectInsideString),
+  'Editor.selectionGrow': wrapCommand(selectionGrow),
+  'Editor.selectLine': wrapCommand(selectLine),
+  'Editor.selectNextOccurrence': wrapCommand(selectNextOccurrence),
+  'Editor.selectPreviousOccurrence': wrapCommand(selectPreviousOccurrence),
+  'Editor.selectUp': wrapCommand(selectUp),
+  'Editor.selectWord': wrapCommand(selectWord),
+  'Editor.selectWordLeft': wrapCommand(selectWordLeft),
+  'Editor.selectWordRight': wrapCommand(selectWordRight),
+  'Editor.setDebugEnabled': wrapCommand(setDebugEnabled),
+  'Editor.setDecorations': wrapCommand(setDecorations),
+  'Editor.setDelta': wrapCommand(setDelta),
+  'Editor.setDeltaY': wrapCommand(setDeltaY),
+  'Editor.setLanguageId': wrapCommand(setLanguageId),
+  'Editor.setSelections': wrapCommand(setSelections),
   'Editor.setSelections2': setSelections2,
   'Editor.showHover': showHover,
   'Editor.showHover2': showHover3,
   'Editor.showSourceActions': showSourceActions,
   'Editor.showSourceActions2': showSourceActions,
   'Editor.showSourceActions3': showSourceActions,
-  'Editor.sortLinesAscending': sortLinesAscending,
-  'Editor.tabCompletion': tabCompletion,
-  'Editor.toggleBlockComment': toggleBlockComment,
-  'Editor.toggleComment': toggleComment,
-  'Editor.toggleLineComment': editorToggleLineComment,
-  'Editor.type': type,
-  'Editor.typeWithAutoClosing': typeWithAutoClosing,
-  'Editor.undo': undo,
-  'Editor.unIndent': editorUnindent,
+  'Editor.sortLinesAscending': wrapCommand(sortLinesAscending),
+  'Editor.tabCompletion': wrapCommand(tabCompletion),
+  'Editor.toggleBlockComment': wrapCommand(toggleBlockComment),
+  'Editor.toggleComment': wrapCommand(toggleComment),
+  'Editor.toggleLineComment': wrapCommand(editorToggleLineComment),
+  'Editor.type': wrapCommand(type),
+  'Editor.typeWithAutoClosing': wrapCommand(typeWithAutoClosing),
+  'Editor.undo': wrapCommand(undo),
+  'Editor.unIndent': wrapCommand(editorUnindent),
   'Editor.updateDebugInfo': updateDebugInfo,
-  'Editor.updateDiagnostics': updateDiagnostics,
+  'Editor.updateDiagnostics': wrapCommand(updateDiagnostics),
   'EditorCompletion.close': close$4,
   'EditorCompletion.closeDetails': closeDetails$1,
   'EditorCompletion.focusFirst': focusFirst$1,
@@ -11592,7 +11554,6 @@ const commandMap = {
   'Initialize.initialize': intialize,
   'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker': sendMessagePortToExtensionHostWorker2
 };
-wrapCommands(commandMap);
 
 const send = port => {
   // @ts-ignore

package/package.json

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