@lvce-editor/editor-worker 1.9.0 → 1.11.0

package/dist/api/api.d.ts

@@ -1,22 +1,27 @@
 interface EventMap {
-  'ColorPicker.loadContent': (state: any) => Promise<any>
   'ColorPicker.handleSliderPointerDown': (state: any, x: number, y: number) => Promise<any>
   'ColorPicker.handleSliderPointerMove': (state: any, x: number, y: number) => Promise<any>
+  'ColorPicker.loadContent': (state: any) => Promise<any>
+  'ColorPicker.render': (oldState: any, newState: any) => Promise<any>
+  'Editor.create': (options: any) => Promise<void>
+  'Editor.offsetAt': (textDocument: any, positionRowIndex: number, positionColumnIndex: number) => Promise<any>
+  'Editor.render': (editorUid: number) => Promise<any>
   'EditorCompletion.loadContent': (editorUid: number, state: any) => Promise<any>
   'EditorCompletion.selectCurrent': (editorUid: number, state: any) => Promise<any>
   'EditorCompletion.selectIndex': (editorUid: number, state: any, index: number) => Promise<any>
-  'Hover.getHoverInfo': (editorUid: number, position: any) => Promise<any>
-  'Font.ensure': (fontName: string, fontUrl: string) => Promise<void>
-  'Editor.create': (options: any) => Promise<void>
-  'Editor.render': (editorUid: number) => Promise<any>
-  'FindWidget.loadContent': (editorUid: number) => Promise<any>
-  'FindWidget.handleInput': (state: any, value: string) => Promise<any>
-  'FindWidget.focusIndex': (state: any, index: number) => Promise<any>
   'FindWidget.focusFirst': (state: any) => Promise<any>
+  'FindWidget.focusIndex': (state: any, index: number) => Promise<any>
   'FindWidget.focusLast': (state: any) => Promise<any>
   'FindWidget.focusNext': (state: any) => Promise<any>
   'FindWidget.focusPrevious': (state: any) => Promise<any>
-  'Editor.offsetAt': (textDocument: any, positionRowIndex: number, positionColumnIndex: number) => Promise<any>
+  'FindWidget.handleInput': (state: any, value: string) => Promise<any>
+  'FindWidget.loadContent': (editorUid: number) => Promise<any>
+  'Font.ensure': (fontName: string, fontUrl: string) => Promise<void>
+  'Hover.getHoverInfo': (editorUid: number, position: any) => Promise<any>
+  'Hover.handleSashPointerDown': (state: any, eventX: number, eventY: number) => Promise<any>
+  'Hover.handleSashPointerMove': (state: any, eventX: number, eventY: number) => Promise<any>
+  'Hover.handleSashPointerUp': (state: any, eventX: number, eventY: number) => Promise<any>
+  'Hover.render': (oldState: any, newState: any) => Promise<any>
 }
 
 export interface EditorWorkerApi {

package/dist/editorWorkerMain.js

@@ -71,7 +71,7 @@ const getNewColor = (x, max) => {
   const newColor = `hsl(${hue}, 100%, 50%)`;
   return newColor;
 };
-const loadContent$2 = state => {
+const loadContent$3 = state => {
   const max = 300;
   const x = 20;
   const color = getNewColor(x, max);
@@ -6571,7 +6571,7 @@ const disposeWithEditor = (state, editor) => {
 };
 const handleEditorClick = disposeWithEditor;
 const handleEditorBlur = disposeWithEditor;
-const loadContent$1 = async (editorUid, state) => {
+const loadContent$2 = async (editorUid, state) => {
   const editor = getEditor(editorUid);
   const {
     itemHeight,
@@ -6646,8 +6646,8 @@ const select = async (state, editor, completionItem) => {
     editor.completionState = None;
     editor.completionUid = 0;
   }
-  await execute$1('Editor.applyEdit', changes);
-  // await Viewlet.dispose(uid)
+  await invoke$3('Editor.applyEdit', changes);
+  await invoke$3('Viewlet.dispose', state.uid);
   return state;
 };
 const selectIndex = (editorUid, state, index) => {
@@ -6717,7 +6717,7 @@ const getMatchCount = matches => {
   return matches.length / 2;
 };
 
-const loadContent = editorId => {
+const loadContent$1 = editorId => {
   const editor = getEditor(editorId);
   const {
     selections,
@@ -7665,6 +7665,12 @@ const Diagnostic = 'Diagnostic';
 const EditorCursor = 'EditorCursor';
 const EditorRow = 'EditorRow';
 const EditorSelection = 'EditorSelection';
+const HoverDisplayString = 'HoverDisplayString';
+const HoverDocumentation = 'HoverDocumentation';
+const HoverEditorRow = 'HoverEditorRow';
+const HoverProblem = 'HoverProblem';
+const HoverProblemDetail = 'HoverProblemDetail';
+const HoverProblemMessage = 'HoverProblemMessage';
 const Viewlet = 'Viewlet';
 
 const getCursorsVirtualDom = cursors => {
@@ -7924,7 +7930,7 @@ const renderGutterInfo = {
     return ['renderGutter', dom];
   }
 };
-const render$1 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus, renderDecorations, renderGutterInfo];
+const render$2 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus, renderDecorations, renderGutterInfo];
 const renderEditor = async id => {
   const instance = get$6(id);
   if (!instance) {
@@ -7936,7 +7942,7 @@ const renderEditor = async id => {
   } = instance;
   const commands = [];
   set$6(id, newState, newState);
-  for (const item of render$1) {
+  for (const item of render$2) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(await item.apply(oldState, newState));
     }
@@ -7944,7 +7950,7 @@ const renderEditor = async id => {
   return commands;
 };
 
-const keep = ['ColorPicker.handleSliderPointerDown', 'ColorPicker.handleSliderPointerMove', 'ColorPicker.loadContent', 'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'FindWidget.focusFirst', 'FindWidget.focusIndex', 'FindWidget.focusLast', 'FindWidget.focusNext', 'FindWidget.focusPrevious', 'FindWidget.handleInput', 'FindWidget.loadContent', 'Font.ensure', 'Hover.getHoverInfo', 'Initialize.initialize', 'EditorCompletion.advance', 'EditorCompletion.handleEditorBlur', 'EditorCompletion.handleEditorClick', 'EditorCompletion.handleEditorDeleteLeft', 'EditorCompletion.handleEditorType', 'EditorCompletion.loadContent', 'EditorCompletion.selectCurrent', 'EditorCompletion.selectIndex', 'ColorPicker.render'];
+const keep = ['ColorPicker.handleSliderPointerDown', 'ColorPicker.handleSliderPointerMove', 'ColorPicker.loadContent', 'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'FindWidget.focusFirst', 'FindWidget.focusIndex', 'FindWidget.focusLast', 'FindWidget.focusNext', 'FindWidget.focusPrevious', 'FindWidget.handleInput', 'FindWidget.loadContent', 'Font.ensure', 'Hover.getHoverInfo', 'Initialize.initialize', 'EditorCompletion.advance', 'EditorCompletion.handleEditorBlur', 'EditorCompletion.handleEditorClick', 'EditorCompletion.handleEditorDeleteLeft', 'EditorCompletion.handleEditorType', 'EditorCompletion.loadContent', 'EditorCompletion.selectCurrent', 'EditorCompletion.selectIndex', 'ColorPicker.render', 'Hover.render', 'Hover.loadContent', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp'];
 
 // TODO wrap commands globally, not per editor
 // TODO only store editor state in editor worker, not in renderer worker also
@@ -7967,6 +7973,7 @@ const wrapCommands = commands => {
 };
 
 const HandlePointerDown = 'handlePointerDown';
+const HandleSashPointerDown = 'handleSashPointerDown';
 
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
@@ -8005,6 +8012,7 @@ const getColorPickerVirtualDom = () => {
   }];
 };
 
+const SetBounds = 'setBounds';
 const SetColor = 'setColor';
 const SetOffsetX = 'setOffsetX';
 
@@ -8033,8 +8041,168 @@ const renderColorPickerDom = {
     return ['Viewlet.setDom2', dom];
   }
 };
-const render = [renderColorPickerDom, renderColor, renderOffsetX];
+const render$1 = [renderColorPickerDom, renderColor, renderOffsetX];
 const renderColorPicker = async (oldState, newState) => {
+  const commands = [];
+  for (const item of render$1) {
+    if (!item.isEqual(oldState, newState)) {
+      commands.push(item.apply(oldState, newState));
+    }
+  }
+  return commands;
+};
+
+const loadContent = async (editorUid, state, position) => {
+  const hoverInfo = await getHover(editorUid, position);
+  if (!hoverInfo) {
+    return state;
+  }
+  const {
+    lineInfos,
+    documentation,
+    x,
+    y,
+    matchingDiagnostics
+  } = hoverInfo;
+  return {
+    ...state,
+    lineInfos,
+    documentation,
+    x,
+    y,
+    diagnostics: matchingDiagnostics
+  };
+};
+const handleSashPointerDown = (state, eventX, eventY) => {
+  return state;
+};
+const handleSashPointerMove = (state, eventX, eventY) => {
+  // @ts-ignore
+  const {
+    x,
+    y
+  } = state;
+  const minWidth = 100;
+  const newWidth = Math.max(eventX - x, minWidth);
+  return {
+    ...state,
+    resizedWidth: newWidth
+  };
+};
+const handleSashPointerUp = (state, eventX, eventY) => {
+  return state;
+};
+
+const getLineInfoVirtualDom = lineInfo => {
+  const dom = [{
+    type: Div,
+    className: HoverEditorRow,
+    childCount: lineInfo.length / 2
+  }];
+  for (let i = 0; i < lineInfo.length; i += 2) {
+    const tokenText = lineInfo[i];
+    const tokenClass = lineInfo[i + 1];
+    dom.push({
+      type: Span,
+      className: tokenClass,
+      childCount: 1
+    },
+    // @ts-ignore
+    text(tokenText));
+  }
+  return dom;
+};
+const getLineInfosVirtualDom = lineInfos => {
+  const dom = lineInfos.flatMap(getLineInfoVirtualDom);
+  return dom;
+};
+
+const hoverProblemMessage = {
+  type: Span,
+  className: HoverProblemMessage,
+  childCount: 1
+};
+const hoverProblemDetail = {
+  type: Span,
+  className: HoverProblemDetail,
+  childCount: 1
+};
+const getChildCount = (lineInfos, documentation, diagnostics) => {
+  return lineInfos.length + documentation ? 1 : 0 + (diagnostics && diagnostics.length > 0) ? 1 : 0;
+};
+const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
+  const dom = [];
+  dom.push({
+    type: Div,
+    className: 'Viewlet EditorHover',
+    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1
+  });
+  if (diagnostics && diagnostics.length > 0) {
+    dom.push({
+      type: Div,
+      className: `${HoverDisplayString} ${HoverProblem}`,
+      childCount: diagnostics.length * 2
+    });
+    for (const diagnostic of diagnostics) {
+      dom.push(hoverProblemMessage, text(diagnostic.message), hoverProblemDetail, text(`${diagnostic.source} (${diagnostic.code})`));
+    }
+  }
+  if (lineInfos.length > 0) {
+    const lineInfosDom = getLineInfosVirtualDom(lineInfos);
+    dom.push({
+      type: Div,
+      className: HoverDisplayString,
+      childCount: lineInfos.length
+    }, ...lineInfosDom);
+  }
+  if (documentation) {
+    dom.push({
+      type: Div,
+      className: HoverDocumentation,
+      childCount: 1
+    }, text(documentation));
+  }
+  dom.push({
+    type: Div,
+    className: 'Sash SashVertical SashResize',
+    childCount: 0,
+    onPointerDown: HandleSashPointerDown
+  });
+  console.log({
+    dom
+  });
+  return dom;
+};
+
+const renderHoverDom = {
+  isEqual(oldState, newState) {
+    return oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.diagnostics === newState.diagnostics;
+  },
+  apply(oldState, newState) {
+    const dom = getHoverVirtualDom(newState.lineInfos, newState.documentation, newState.diagnostics);
+    return [/* method */'Viewlet.setDom2', dom];
+  }
+};
+const renderBounds = {
+  isEqual(oldState, newState) {
+    return oldState.x === newState.x && oldState.y === newState.y && oldState.resizedWidth === newState.resizedWidth;
+  },
+  apply(oldState, newState) {
+    // @ts-ignore
+    const {
+      x,
+      y,
+      width,
+      height,
+      resizedWidth,
+      uid
+    } = newState;
+    console.log('apply');
+    return [SetBounds, x, y, resizedWidth, height];
+  }
+};
+const render = [renderHoverDom, renderBounds];
+const renderHover = async (oldState, newState) => {
   const commands = [];
   for (const item of render) {
     if (!item.isEqual(oldState, newState)) {
@@ -8047,7 +8215,7 @@ const renderColorPicker = async (oldState, newState) => {
 const commandMap = {
   'ColorPicker.handleSliderPointerDown': handleSliderPointerDown,
   'ColorPicker.handleSliderPointerMove': handleSliderPointerMove,
-  'ColorPicker.loadContent': loadContent$2,
+  'ColorPicker.loadContent': loadContent$3,
   'ColorPicker.render': renderColorPicker,
   'Editor.addCursorAbove': addCursorAbove,
   'Editor.addCursorBelow': addCursorBelow,
@@ -8172,7 +8340,7 @@ const commandMap = {
   'EditorCompletion.handleEditorClick': handleEditorClick,
   'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft,
   'EditorCompletion.handleEditorType': handleEditorType,
-  'EditorCompletion.loadContent': loadContent$1,
+  'EditorCompletion.loadContent': loadContent$2,
   'EditorCompletion.selectCurrent': selectCurrent,
   'EditorCompletion.selectIndex': selectIndex,
   'FindWidget.focusFirst': focusFirst,
@@ -8181,9 +8349,14 @@ const commandMap = {
   'FindWidget.focusNext': focusNext,
   'FindWidget.focusPrevious': focusPrevious,
   'FindWidget.handleInput': handleInput,
-  'FindWidget.loadContent': loadContent,
+  'FindWidget.loadContent': loadContent$1,
   'Font.ensure': ensure,
   'Hover.getHoverInfo': getEditorHoverInfo,
+  'Hover.handleSashPointerDown': handleSashPointerDown,
+  'Hover.handleSashPointerMove': handleSashPointerMove,
+  'Hover.handleSashPointerUp': handleSashPointerUp,
+  'Hover.render': renderHover,
+  'Hover.loadContent': loadContent,
   'Initialize.initialize': intialize
 };
 wrapCommands(commandMap);

package/package.json

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