@lvce-editor/editor-worker 8.6.0 → 9.0.0

package/dist/editorWorkerMain.js

@@ -6775,226 +6775,52 @@ const create$1 = () => {
   return widget;
 };
 
-const executeHoverProvider = async (editor, offset) => {
-  object(editor);
-  number(offset);
-  return execute({
-    event: OnHover,
-    editor,
-    method: HoverExecute,
-    args: [offset],
-    noProviderFoundMessage: 'No hover provider found'
-  });
-};
-
-const getHover = async (editor, offset) => {
-  object(editor);
-  number(offset);
-  // TODO invoke extension host worker directly
-  const hover = await executeHoverProvider(editor, offset);
-  return hover;
-};
-
-const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
-  // @ts-ignore
-  // return RendererProcess.invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width)
-  return 100;
-};
-
-const deepCopy = value => {
-  return structuredClone(value);
-};
-
-const getInitialLineState = initialLineState => {
-  return deepCopy(initialLineState);
-};
-
-const getLineInfo$1 = (line, tokens, TokenMap) => {
-  const tokensLength = tokens.length;
-  let end = 0;
-  let start = 0;
-  const lineInfo = [];
-  for (let i = 0; i < tokensLength; i += 2) {
-    const tokenType = tokens[i];
-    const tokenLength = tokens[i + 1];
-    end += tokenLength;
-    const text = line.slice(start, end);
-    const className = `Token ${TokenMap[tokenType] || 'Unknown'}`;
-    const normalizedText = text;
-    lineInfo.push(normalizedText, className);
-    start = end;
-  }
-  return lineInfo;
-};
-
-const state = {
-  warned: []
-};
-const flattenTokensArray = tokens => {
-  const flattened = [];
-  for (const token of tokens) {
-    object(token);
-    flattened.push(token.type, token.length);
-  }
-  return flattened;
-};
-const warnDeprecatedArrayReturn = (languageId, fn) => {
-  if (state.warned.includes(fn)) {
-    return;
-  }
-  state.warned.push(fn);
-  console.warn(`tokenizers without hasArrayReturn=false are deprecated (language ${languageId})`);
-};
-const safeTokenizeLine = (languageId, tokenizeLine, line, lineStateAtStart, hasArrayReturn) => {
-  try {
-    const lineState = tokenizeLine(line, lineStateAtStart);
-    if (!lineState?.tokens || !lineState.state) {
-      throw new Error('invalid tokenization result');
-    }
-    if (!hasArrayReturn) {
-      warnDeprecatedArrayReturn(languageId, tokenizeLine);
-      // workaround for old tokenizers
-      lineState.tokens = flattenTokensArray(lineState.tokens);
-    }
-    return lineState;
-  } catch (error) {
-    console.error(error);
-    return {
-      tokens: [/* type */0, /* length */line.length],
-      lineState: lineStateAtStart
-    };
-  }
+const launchHoverWorker = async () => {
+  const name = 'Hover Worker';
+  const url = 'hoverWorkerMain.js';
+  const intializeCommand = 'Hover.initialize';
+  const rpc = await launchWorker(name, url, intializeCommand);
+  return rpc;
 };
 
-const getLineInfos = (lines, tokenizer, languageId) => {
-  const lineInfos = [];
-  const {
-    tokenizeLine,
-    initialLineState,
-    hasArrayReturn,
-    TokenMap
-  } = tokenizer;
-  let currentLineState = getInitialLineState(initialLineState);
-  for (const line of lines) {
-    const result = safeTokenizeLine(languageId, tokenizeLine, line, currentLineState, hasArrayReturn);
-    const {
-      tokens
-    } = result;
-    const lineInfo = getLineInfo$1(line, tokens, TokenMap);
-    lineInfos.push(lineInfo);
-    currentLineState = result;
+let workerPromise$1;
+const getOrCreate$1 = () => {
+  if (!workerPromise$1) {
+    workerPromise$1 = launchHoverWorker();
   }
-  return lineInfos;
+  return workerPromise$1;
 };
-
-const tokenizeCodeBlock = async (codeBlock, languageId, tokenizerPath) => {
-  await loadTokenizer(languageId, tokenizerPath);
-  const tokenizer = getTokenizer(languageId);
-  const lines = splitLines(codeBlock);
-  const lineInfos = getLineInfos(lines, tokenizer, languageId);
-  return lineInfos;
+const invoke$2 = async (method, ...params) => {
+  const worker = await getOrCreate$1();
+  return await worker.invoke(method, ...params);
 };
 
-const getHoverPosition = (position, selections) => {
-  if (position) {
-    return position;
-  }
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  return {
-    rowIndex,
-    columnIndex
-  };
-};
-const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
-  const matching = [];
-  for (const diagnostic of diagnostics) {
-    if (diagnostic.rowIndex === rowIndex) {
-      matching.push(diagnostic);
-    }
-  }
-  return matching;
-};
-const fallbackDisplayStringLanguageId = 'typescript'; // TODO remove this
-const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) => {
-  const x$1 = x(editor, rowIndex, wordStart);
-  const y$1 = editor.height - y(editor, rowIndex) + editor.y + 40;
-  return {
-    x: x$1,
-    y: y$1
-  };
-};
-const getEditorHoverInfo = async (editorUid, position) => {
-  number(editorUid);
-  const instance = get$4(editorUid);
-  const editor = instance.newState;
-  const {
-    selections
-  } = editor;
+const newStateGenerator$1 = async (state, parentUid) => {
   const {
-    rowIndex,
-    columnIndex
-  } = getHoverPosition(position, selections);
-  const offset = offsetAt(editor, rowIndex, columnIndex);
-  const hover = await getHover(editor, offset);
-  if (!hover) {
-    return undefined;
-  }
-  const {
-    displayString,
-    documentation,
-    displayStringLanguageId
-  } = hover;
-  const tokenizerPath = '';
-  const lineInfos = await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath);
-  const wordPart = getWordBefore(editor, rowIndex, columnIndex);
-  const wordStart = columnIndex - wordPart.length;
-  await measureTextBlockHeight();
-  const {
-    x,
-    y
-  } = getHoverPositionXy(editor, rowIndex, wordStart);
-  const diagnostics = editor.diagnostics || [];
-  const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex);
-  return {
-    lineInfos,
-    documentation,
+    uid,
     x,
     y,
-    matchingDiagnostics
-  };
-};
-
-const loadHoverContent = async state => {
-  // TODO
-  const position = undefined;
-  const hoverInfo = await getEditorHoverInfo(state.editorUid, position);
-  if (!hoverInfo) {
-    return state;
-  }
+    width,
+    height
+  } = state;
   const {
-    lineInfos,
-    documentation,
-    x,
-    y,
-    matchingDiagnostics
-  } = hoverInfo;
+    newState
+  } = get$4(parentUid);
+  const {
+    languageId
+  } = newState;
+  await invoke$2('Hover.create', uid, x, y, width, height, parentUid, languageId);
+  await invoke$2('Hover.loadContent', uid);
+  const diff = await invoke$2('Hover.diff2', uid);
+  const commands = await invoke$2('Hover.render2', uid, diff);
   return {
     ...state,
-    lineInfos,
-    documentation,
-    x,
-    y,
-    width: 600,
-    diagnostics: matchingDiagnostics
+    commands
   };
 };
-
-const newStateGenerator$1 = async state => {
-  return loadHoverContent(state);
-};
-const showHover2 = async editor => {
-  return addWidgetToEditor(Hover, FocusEditorHover, editor, create$1, newStateGenerator$1);
+const showHover3 = async editor => {
+  const fullFocus = false;
+  return addWidgetToEditor(Hover, FocusEditorHover, editor, create$1, newStateGenerator$1, fullFocus);
 };
 
 const EditorHover = 'EditorHover';
@@ -7041,15 +6867,15 @@ const launchSourceActionWorker = async () => {
   return rpc;
 };
 
-let workerPromise$1;
-const getOrCreate$1 = () => {
-  if (!workerPromise$1) {
-    workerPromise$1 = launchSourceActionWorker();
+let workerPromise;
+const getOrCreate = () => {
+  if (!workerPromise) {
+    workerPromise = launchSourceActionWorker();
   }
-  return workerPromise$1;
+  return workerPromise;
 };
-const invoke$2 = async (method, ...params) => {
-  const worker = await getOrCreate$1();
+const invoke$1 = async (method, ...params) => {
+  const worker = await getOrCreate();
   return await worker.invoke(method, ...params);
 };
 
@@ -7067,10 +6893,10 @@ const newStateGenerator = async (state, parentUid) => {
   const {
     languageId
   } = newState;
-  await invoke$2('SourceActions.create', uid, x, y, width, height, parentUid, languageId);
-  await invoke$2('SourceActions.loadContent', uid);
-  const diff = await invoke$2('SourceActions.diff2', uid);
-  const commands = await invoke$2('SourceActions.render2', uid, diff);
+  await invoke$1('SourceActions.create', uid, x, y, width, height, parentUid, languageId);
+  await invoke$1('SourceActions.loadContent', uid);
+  const diff = await invoke$1('SourceActions.diff2', uid);
+  const commands = await invoke$1('SourceActions.render2', uid, diff);
   return {
     ...state,
     commands
@@ -7877,6 +7703,7 @@ const isFunctional = widgetId => {
     case Completion:
     case Find:
     case SourceAction$1:
+    case Hover:
       return true;
     default:
       return false;
@@ -7914,26 +7741,6 @@ const addWidget$1 = (widget, id, render) => {
   return allCommands;
 };
 
-const launchHoverWorker = async () => {
-  const name = 'Hover Worker';
-  const url = 'hoverWorkerMain.js';
-  const intializeCommand = 'Hover.initialize';
-  const rpc = await launchWorker(name, url, intializeCommand);
-  return rpc;
-};
-
-let workerPromise;
-const getOrCreate = () => {
-  if (!workerPromise) {
-    workerPromise = launchHoverWorker();
-  }
-  return workerPromise;
-};
-const invoke$1 = async (method, ...params) => {
-  const worker = await getOrCreate();
-  return await worker.invoke(method, ...params);
-};
-
 const getWidgetInvoke = widgetId => {
   switch (widgetId) {
     case ColorPicker$1:
@@ -7945,9 +7752,9 @@ const getWidgetInvoke = widgetId => {
     case Rename$1:
       return invoke$6;
     case SourceAction$1:
-      return invoke$2;
-    case Hover:
       return invoke$1;
+    case Hover:
+      return invoke$2;
     default:
       return undefined;
   }
@@ -8066,13 +7873,13 @@ const {
   toggleDetails: toggleDetails$1,
   closeDetails: closeDetails$1,
   handleWheel: handleWheel$1,
-  close: close$3
+  close: close$4
 } = createFns(['handleEditorType', 'focusFirst', 'focusNext', 'focusPrevious', 'focusLast', 'handleEditorDeleteLeft', 'openDetails', 'focusIndex', 'handleEditorBlur', 'handleEditorClick', 'openDetails', 'selectCurrent', 'selectIndex', 'toggleDetails', 'closeDetails', 'handleWheel', 'close'], 'Completions', Completion);
 
 const EditorCompletionWidget = {
   __proto__: null,
   add: add$7,
-  close: close$3,
+  close: close$4,
   closeDetails: closeDetails$1,
   focusFirst: focusFirst$1,
   focusIndex: focusIndex$2,
@@ -8121,7 +7928,7 @@ const remove$6 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
 };
 const {
-  close: close$2,
+  close: close$3,
   focusCloseButton,
   focusFind,
   focusNext: focusNext$2,
@@ -8152,7 +7959,7 @@ const {
 const EditorFindWidget = {
   __proto__: null,
   add: add$6,
-  close: close$2,
+  close: close$3,
   focusCloseButton,
   focusFind,
   focusNext: focusNext$2,
@@ -8182,6 +7989,196 @@ const EditorFindWidget = {
   toggleUseRegularExpression
 };
 
+const executeHoverProvider = async (editor, offset) => {
+  object(editor);
+  number(offset);
+  return execute({
+    event: OnHover,
+    editor,
+    method: HoverExecute,
+    args: [offset],
+    noProviderFoundMessage: 'No hover provider found'
+  });
+};
+
+const getHover = async (editor, offset) => {
+  object(editor);
+  number(offset);
+  // TODO invoke extension host worker directly
+  const hover = await executeHoverProvider(editor, offset);
+  return hover;
+};
+
+const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
+  // @ts-ignore
+  // return RendererProcess.invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width)
+  return 100;
+};
+
+const deepCopy = value => {
+  return structuredClone(value);
+};
+
+const getInitialLineState = initialLineState => {
+  return deepCopy(initialLineState);
+};
+
+const getLineInfo$1 = (line, tokens, TokenMap) => {
+  const tokensLength = tokens.length;
+  let end = 0;
+  let start = 0;
+  const lineInfo = [];
+  for (let i = 0; i < tokensLength; i += 2) {
+    const tokenType = tokens[i];
+    const tokenLength = tokens[i + 1];
+    end += tokenLength;
+    const text = line.slice(start, end);
+    const className = `Token ${TokenMap[tokenType] || 'Unknown'}`;
+    const normalizedText = text;
+    lineInfo.push(normalizedText, className);
+    start = end;
+  }
+  return lineInfo;
+};
+
+const state = {
+  warned: []
+};
+const flattenTokensArray = tokens => {
+  const flattened = [];
+  for (const token of tokens) {
+    object(token);
+    flattened.push(token.type, token.length);
+  }
+  return flattened;
+};
+const warnDeprecatedArrayReturn = (languageId, fn) => {
+  if (state.warned.includes(fn)) {
+    return;
+  }
+  state.warned.push(fn);
+  console.warn(`tokenizers without hasArrayReturn=false are deprecated (language ${languageId})`);
+};
+const safeTokenizeLine = (languageId, tokenizeLine, line, lineStateAtStart, hasArrayReturn) => {
+  try {
+    const lineState = tokenizeLine(line, lineStateAtStart);
+    if (!lineState?.tokens || !lineState.state) {
+      throw new Error('invalid tokenization result');
+    }
+    if (!hasArrayReturn) {
+      warnDeprecatedArrayReturn(languageId, tokenizeLine);
+      // workaround for old tokenizers
+      lineState.tokens = flattenTokensArray(lineState.tokens);
+    }
+    return lineState;
+  } catch (error) {
+    console.error(error);
+    return {
+      tokens: [/* type */0, /* length */line.length],
+      lineState: lineStateAtStart
+    };
+  }
+};
+
+const getLineInfos = (lines, tokenizer, languageId) => {
+  const lineInfos = [];
+  const {
+    tokenizeLine,
+    initialLineState,
+    hasArrayReturn,
+    TokenMap
+  } = tokenizer;
+  let currentLineState = getInitialLineState(initialLineState);
+  for (const line of lines) {
+    const result = safeTokenizeLine(languageId, tokenizeLine, line, currentLineState, hasArrayReturn);
+    const {
+      tokens
+    } = result;
+    const lineInfo = getLineInfo$1(line, tokens, TokenMap);
+    lineInfos.push(lineInfo);
+    currentLineState = result;
+  }
+  return lineInfos;
+};
+
+const tokenizeCodeBlock = async (codeBlock, languageId, tokenizerPath) => {
+  await loadTokenizer(languageId, tokenizerPath);
+  const tokenizer = getTokenizer(languageId);
+  const lines = splitLines(codeBlock);
+  const lineInfos = getLineInfos(lines, tokenizer, languageId);
+  return lineInfos;
+};
+
+const getHoverPosition = (position, selections) => {
+  if (position) {
+    return position;
+  }
+  const rowIndex = selections[0];
+  const columnIndex = selections[1];
+  return {
+    rowIndex,
+    columnIndex
+  };
+};
+const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
+  const matching = [];
+  for (const diagnostic of diagnostics) {
+    if (diagnostic.rowIndex === rowIndex) {
+      matching.push(diagnostic);
+    }
+  }
+  return matching;
+};
+const fallbackDisplayStringLanguageId = 'typescript'; // TODO remove this
+const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) => {
+  const x$1 = x(editor, rowIndex, wordStart);
+  const y$1 = editor.height - y(editor, rowIndex) + editor.y + 40;
+  return {
+    x: x$1,
+    y: y$1
+  };
+};
+const getEditorHoverInfo = async (editorUid, position) => {
+  number(editorUid);
+  const instance = get$4(editorUid);
+  const editor = instance.newState;
+  const {
+    selections
+  } = editor;
+  const {
+    rowIndex,
+    columnIndex
+  } = getHoverPosition(position, selections);
+  const offset = offsetAt(editor, rowIndex, columnIndex);
+  const hover = await getHover(editor, offset);
+  if (!hover) {
+    return undefined;
+  }
+  const {
+    displayString,
+    documentation,
+    displayStringLanguageId
+  } = hover;
+  const tokenizerPath = '';
+  const lineInfos = await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath);
+  const wordPart = getWordBefore(editor, rowIndex, columnIndex);
+  const wordStart = columnIndex - wordPart.length;
+  await measureTextBlockHeight();
+  const {
+    x,
+    y
+  } = getHoverPositionXy(editor, rowIndex, wordStart);
+  const diagnostics = editor.diagnostics || [];
+  const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex);
+  return {
+    lineInfos,
+    documentation,
+    x,
+    y,
+    matchingDiagnostics
+  };
+};
+
 const loadContent = async (editorUid, state, position) => {
   const hoverInfo = await getEditorHoverInfo(editorUid, position);
   if (!hoverInfo) {
@@ -8403,7 +8400,7 @@ const remove$5 = widget => {
 };
 const {
   handleInput,
-  close: close$1,
+  close: close$2,
   accept
 } = createFns(['handleInput', 'close', 'accept'], 'Rename', Rename$1);
 
@@ -8411,7 +8408,7 @@ const EditorRenameWidget = {
   __proto__: null,
   accept,
   add: add$5,
-  close: close$1,
+  close: close$2,
   handleInput,
   remove: remove$5,
   render: render$8
@@ -8471,13 +8468,13 @@ const {
   toggleDetails,
   closeDetails,
   handleWheel,
-  close
+  close: close$1
 } = createFns(['focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusPrevious', 'selectCurrent', 'selectIndex', 'selectItem', 'toggleDetails', 'closeDetails', 'handleWheel', 'close'], 'SourceActions', SourceAction$1);
 
 const EditorSourceActionWidget = {
   __proto__: null,
   add: add$4,
-  close,
+  close: close$1,
   closeDetails,
   focusFirst,
   focusIndex,
@@ -10625,7 +10622,7 @@ const commandMap = {
   'Editor.setSelections': setSelections,
   'Editor.setSelections2': setSelections2,
   'Editor.showHover': showHover,
-  'Editor.showHover2': showHover2,
+  'Editor.showHover2': showHover3,
   'Editor.showSourceActions': showSourceActions,
   'Editor.showSourceActions2': showSourceActions,
   'Editor.showSourceActions3': showSourceActions,
@@ -10641,7 +10638,7 @@ const commandMap = {
   'Editor.unIndent': editorUnindent,
   'Editor.updateDebugInfo': updateDebugInfo,
   'Editor.updateDiagnostics': updateDiagnostics,
-  'EditorCompletion.close': close$3,
+  'EditorCompletion.close': close$4,
   'EditorCompletion.closeDetails': closeDetails$1,
   'EditorCompletion.focusFirst': focusFirst$1,
   'EditorCompletion.focusIndex': focusIndex$2,
@@ -10656,7 +10653,7 @@ const commandMap = {
   'EditorCompletion.selectCurrent': selectCurrent$1,
   'EditorCompletion.selectIndex': selectIndex$1,
   'EditorCompletion.toggleDetails': toggleDetails$1,
-  'EditorSourceAction.close': close,
+  'EditorSourceAction.close': close$1,
   'EditorSourceAction.closeDetails': closeDetails,
   'EditorSourceAction.focusFirst': focusFirst,
   'EditorSourceAction.focusIndex': focusIndex,
@@ -10668,10 +10665,10 @@ const commandMap = {
   'EditorSourceAction.selectItem': selectItem,
   'EditorSourceAction.toggleDetails': toggleDetails,
   'EditorRename.accept': accept,
-  'EditorRename.close': close$1,
+  'EditorRename.close': close$2,
   'EditorRename.handleInput': handleInput,
   'EditorSourceActions.focusNext': focusNext$1,
-  'FindWidget.close': close$2,
+  'FindWidget.close': close$3,
   'FindWidget.focusCloseButton': focusCloseButton,
   'FindWidget.focusFind': focusFind,
   'FindWidget.focusNext': focusNext$2,
@@ -10980,14 +10977,14 @@ const EditorCompletionDetailWidget = {
 };
 
 const render = widget => {
-  const commands = renderHover(widget.oldState, widget.newState);
+  const commands = renderFull$4(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
   } = widget.newState;
   for (const command of commands) {
-    if (command[0] === SetDom2) {
-      wrappedCommands.push([command[0], uid, ...command.slice(1)]);
+    if (command[0] === SetDom2 || command[0] === SetCss || command[0] === AppendToBody || command[0] === SetBounds2 || command[0] === RegisterEventListeners || command[0] === SetSelectionByName || command[0] === SetValueByName || command[0] === SetFocusContext || command[0] === SetUid || command[0] === 'Viewlet.focusSelector') {
+      wrappedCommands.push(command);
     } else {
       wrappedCommands.push(['Viewlet.send', uid, ...command]);
     }
@@ -10995,13 +10992,19 @@ const render = widget => {
   return wrappedCommands;
 };
 const add = widget => {
-  return addWidget$1(widget, 'EditorHover', render);
+  return addWidget$1(widget, 'EditorCompletion', render);
+};
+const remove = widget => {
+  return [['Viewlet.dispose', widget.newState.uid]];
 };
-const remove = removeWidget$1;
+const {
+  close
+} = createFns(['close'], '', Hover);
 
 const EditorHoverWidget = {
   __proto__: null,
   add,
+  close,
   remove,
   render
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "8.6.0",
+  "version": "9.0.0",
   "license": "MIT",
   "author": "Lvce Editor",
   "type": "module",