@lvce-editor/editor-worker 3.0.0 → 3.1.0

package/dist/api/api.d.ts

@@ -9,6 +9,9 @@ interface EventMap {
   '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>
+  'EditorCompletion.openDetails': (editorUid: number, state: any) => Promise<any>
+  'EditorCompletion.closeDetails': (editorUid: number, state: any) => Promise<any>
+  'EditorCompletion.toggleDetails': (editorUid: number, state: any) => Promise<any>
   'FindWidget.focusFirst': (state: any) => Promise<any>
   'FindWidget.focusIndex': (state: any, index: number) => Promise<any>
   'FindWidget.focusLast': (state: any) => Promise<any>

package/dist/editorWorkerMain.js

@@ -4,7 +4,7 @@ let AssertionError$1 = class AssertionError extends Error {
     this.name = 'AssertionError';
   }
 };
-const getType$1 = value => {
+const getType$2 = value => {
   switch (typeof value) {
     case 'number':
       return 'number';
@@ -27,31 +27,31 @@ const getType$1 = value => {
   }
 };
 const object = value => {
-  const type = getType$1(value);
+  const type = getType$2(value);
   if (type !== 'object') {
     throw new AssertionError$1('expected value to be of type object');
   }
 };
 const number$1 = value => {
-  const type = getType$1(value);
+  const type = getType$2(value);
   if (type !== 'number') {
     throw new AssertionError$1('expected value to be of type number');
   }
 };
 const array = value => {
-  const type = getType$1(value);
+  const type = getType$2(value);
   if (type !== 'array') {
     throw new AssertionError$1('expected value to be of type array');
   }
 };
 const string = value => {
-  const type = getType$1(value);
+  const type = getType$2(value);
   if (type !== 'string') {
     throw new AssertionError$1('expected value to be of type string');
   }
 };
 const boolean = value => {
-  const type = getType$1(value);
+  const type = getType$2(value);
   if (type !== 'boolean') {
     throw new AssertionError$1('expected value to be of type boolean');
   }
@@ -211,10 +211,10 @@ const renderColorPickerDom = {
     return ['Viewlet.setDom2', dom];
   }
 };
-const render$4 = [renderColorPickerDom, renderColor, renderOffsetX];
+const render$6 = [renderColorPickerDom, renderColor, renderOffsetX];
 const renderColorPicker = async (oldState, newState) => {
   const commands = [];
-  for (const item of render$4) {
+  for (const item of render$6) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -1140,7 +1140,7 @@ class AssertionError extends Error {
     this.name = 'AssertionError';
   }
 }
-const getType = value => {
+const getType$1 = value => {
   switch (typeof value) {
     case 'number':
       return 'number';
@@ -1163,7 +1163,7 @@ const getType = value => {
   }
 };
 const number = value => {
-  const type = getType(value);
+  const type = getType$1(value);
   if (type !== 'number') {
     throw new AssertionError('expected value to be of type number');
   }
@@ -1177,7 +1177,7 @@ const set$5 = (id, fn) => {
 const get$5 = id => {
   return state$1$1.callbacks[id];
 };
-const remove$1 = id => {
+const remove$2 = id => {
   delete state$1$1.callbacks[id];
 };
 const state$a = {
@@ -1223,7 +1223,7 @@ const resolve = (id, args) => {
     return;
   }
   fn(args);
-  remove$1(id);
+  remove$2(id);
 };
 const create$2$1 = (method, params) => {
   const {
@@ -1372,14 +1372,16 @@ const unwrapJsonRpcResult = responseMessage => {
   }
   throw new JsonRpcError('unexpected response message');
 };
-const create$1$1 = (message, error) => {
-  return {
-    jsonrpc: Two,
-    id: message.id,
-    error
-  };
-};
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
+const getType = prettyError => {
+  if (prettyError && prettyError.type) {
+    return prettyError.type;
+  }
+  if (prettyError && prettyError.constructor && prettyError.constructor.name) {
+    return prettyError.constructor.name;
+  }
+  return undefined;
+};
 const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
@@ -1394,18 +1396,26 @@ const getErrorProperty = (error, prettyError) => {
     data: {
       stack: prettyError.stack,
       codeFrame: prettyError.codeFrame,
-      type: prettyError.type,
-      code: prettyError.code
+      type: getType(prettyError),
+      code: prettyError.code,
+      name: prettyError.name
     }
   };
 };
+const create$1$1 = (message, error) => {
+  return {
+    jsonrpc: Two,
+    id: message.id,
+    error
+  };
+};
 const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(message, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$8 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -1414,7 +1424,7 @@ const create$5 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$8(message, resultProperty);
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
@@ -1490,14 +1500,7 @@ const invoke$5 = async (ipc, method, ...params) => {
   const result = unwrapJsonRpcResult(responseMessage);
   return result;
 };
-
-// TODO deprecated old typings,
-// always use automatic transferrable detection
-const invokeAndTransfer$2 = async (ipc, handle, method, ...params) => {
-  if (typeof handle === 'string') {
-    params = [method, ...params];
-    method = handle;
-  }
+const invokeAndTransfer$2 = async (ipc, method, ...params) => {
   const {
     message,
     promise
@@ -1653,7 +1656,7 @@ const waitForFirstMessage$1 = async port => {
   return event;
 };
 
-const create$4 = async () => {
+const create$7 = async () => {
   const {
     port1,
     port2
@@ -1698,7 +1701,7 @@ const wrap$3 = port => {
 
 const IpcParentWithExtensionHostWorker = {
   __proto__: null,
-  create: create$4,
+  create: create$7,
   wrap: wrap$3
 };
 
@@ -1706,7 +1709,7 @@ const sendMessagePortToSyntaxHighlightingWorker = async port => {
   await invokeAndTransfer('SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
 };
 
-const create$3 = async () => {
+const create$6 = async () => {
   const {
     port1,
     port2
@@ -1751,7 +1754,7 @@ const wrap$1 = port => {
 
 const IpcParentWithSyntaxHighlightingWorker = {
   __proto__: null,
-  create: create$3,
+  create: create$6,
   wrap: wrap$1
 };
 
@@ -1759,7 +1762,7 @@ const sendMessagePortToRendererProcess = async port => {
   await invokeAndTransfer('SendMessagePortToRendererProcess.sendMessagePortToRendererProcess', port, 'HandleMessagePort.handleMessagePort');
 };
 
-const create$2 = async () => {
+const create$5 = async () => {
   const {
     port1,
     port2
@@ -1804,7 +1807,7 @@ const wrap = port => {
 
 const IpcParentWithRendererProcess = {
   __proto__: null,
-  create: create$2,
+  create: create$5,
   wrap
 };
 
@@ -1821,7 +1824,7 @@ const getModule$1 = method => {
   }
 };
 
-const create$1 = async ({
+const create$4 = async ({
   method,
   ...options
 }) => {
@@ -1839,7 +1842,7 @@ const create$1 = async ({
 const createRpc = method => {
   let _ipc;
   const listen = async () => {
-    const ipc = await create$1({
+    const ipc = await create$4({
       method
     });
     handleIpc(ipc);
@@ -2116,7 +2119,7 @@ const getAccurateColumnIndexAscii = (line, guess, averageCharWidth, eventX, font
 const supported = () => {
   return 'Segmenter' in Intl;
 };
-const create = () => {
+const create$3 = () => {
   // @ts-ignore
   const segmenter = new Intl.Segmenter();
   return {
@@ -2154,7 +2157,7 @@ const create = () => {
 
 // @ts-ignore
 const getAccurateColumnIndexUnicode = (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing) => {
-  const segmenter = create();
+  const segmenter = create$3();
   const segments = segmenter.getSegments(line);
   const isMonospaceFont = false;
   const charWidth = 0;
@@ -2383,7 +2386,9 @@ const cancelSelection = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
+// TODO use numeric widget id
 const Completion = 'completion';
+const CompletionDetail = 'completionDetail';
 
 const isCompletionWidget = widget => {
   return widget.id === Completion;
@@ -2697,7 +2702,7 @@ const characterLeft = (line, columnIndex) => {
   if (!supported()) {
     return 1;
   }
-  const segmenter = create();
+  const segmenter = create$3();
   const last = segmenter.at(line, columnIndex - 1);
   return columnIndex - last.index;
 };
@@ -2708,7 +2713,7 @@ const characterRight = (line, columnIndex) => {
   if (!supported()) {
     return 1;
   }
-  const segmenter = create();
+  const segmenter = create$3();
   const next = segmenter.at(line, columnIndex);
   return next.segment.length;
 };
@@ -4465,6 +4470,44 @@ const moveSelectionPx = (editor, x, y) => {
   return editorMoveSelection(editor, position);
 };
 
+const create$2 = () => {
+  return Math.random();
+};
+
+const create$1 = () => {
+  const completionUid = create$2();
+  const completionWidget = {
+    id: Completion,
+    oldState: {
+      items: [],
+      itemHeight: 20,
+      maxHeight: 150,
+      minLineY: 0,
+      maxLineY: 0,
+      uid: completionUid,
+      focusedIndex: -1,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0
+    },
+    newState: {
+      items: [],
+      itemHeight: 20,
+      maxHeight: 150,
+      minLineY: 0,
+      maxLineY: 10,
+      uid: completionUid,
+      focusedIndex: -1,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0
+    }
+  };
+  return completionWidget;
+};
+
 const OnCompletion = 'onCompletion';
 const OnHover = 'onHover';
 
@@ -4922,26 +4965,7 @@ const openCompletion = async editor => {
   if (hasWidget(widgets, Completion)) {
     return editor;
   }
-  const completionUid = Math.random();
-  const completionWidget = {
-    id: Completion,
-    oldState: {
-      items: [],
-      itemHeight: 20,
-      maxHeight: 150,
-      minLineY: 0,
-      maxLineY: 0,
-      uid: completionUid
-    },
-    newState: {
-      items: [],
-      itemHeight: 20,
-      maxHeight: 150,
-      minLineY: 0,
-      maxLineY: 10,
-      uid: completionUid
-    }
-  };
+  const completionWidget = create$1();
   const newWidgets = [...widgets, completionWidget];
   const newEditor = {
     ...editor,
@@ -6652,15 +6676,32 @@ const editorUnindent = editor => {
 
 // editor.lines //?
 
-const isCompletion$2 = widget => {
-  return widget.id === Completion;
-};
-const getCompletionState = editor => {
+const getWidgetState = (editor, id) => {
   const {
     widgets
   } = editor;
-  const child = widgets.find(isCompletion$2);
-  return child.newState;
+  for (const widget of widgets) {
+    if (widget.id === id) {
+      return widget.newState;
+    }
+  }
+  return undefined;
+};
+
+const getCompletionState = editor => {
+  return getWidgetState(editor, Completion);
+};
+
+const closeDetails = editor => {
+  const child = getCompletionState(editor);
+  if (!child) {
+    return editor;
+  }
+  console.log('open details');
+  // TODO when completion details are open, close them
+  // TODO when completion details are opening, close them
+  // TODO when completion details are closed, open them
+  return editor;
 };
 
 const isCompletion$1 = widget => {
@@ -6696,16 +6737,81 @@ const focusFirst$1 = editor => {
 
 const focusNext$1 = editor => {
   const child = getCompletionState(editor);
+  if (!child) {
+    return editor;
+  }
   const nextIndex = child.focusedIndex + 1;
   return focusIndex$1(editor, nextIndex);
 };
 
 const focusPrevious$1 = editor => {
   const child = getCompletionState(editor);
+  if (!child) {
+    return editor;
+  }
   const previousIndex = child.focusedIndex - 1;
   return focusIndex$1(editor, previousIndex);
 };
 
+const create = () => {
+  const completionUid = create$2();
+  const completionWidget = {
+    id: CompletionDetail,
+    oldState: {
+      content: '',
+      uid: completionUid,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0
+    },
+    newState: {
+      content: '',
+      uid: completionUid,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0
+    }
+  };
+  return completionWidget;
+};
+
+const getCompletionDetailState = editor => {
+  return getWidgetState(editor, CompletionDetail);
+};
+
+const openDetails = editor => {
+  const child = getCompletionState(editor);
+  if (!child) {
+    return editor;
+  }
+  const detailState = getCompletionDetailState(editor);
+  if (detailState) {
+    return editor;
+  }
+  const widget = create();
+  console.log({
+    child
+  });
+  const newestState = {
+    ...widget.newState,
+    content: 'abc',
+    x: child.x + child.width,
+    y: child.y,
+    width: 100,
+    height: 100
+  };
+  const latestWidgets = [...editor.widgets, {
+    ...widget,
+    newState: newestState
+  }];
+  return {
+    ...editor,
+    widgets: latestWidgets
+  };
+};
+
 const getEdits = async (editor, completionItem) => {
   const child = getCompletionState(editor);
   // @ts-ignore
@@ -6755,6 +6861,9 @@ const select = async (editor, completionItem) => {
 };
 const selectIndex = (editor, index) => {
   const child = getCompletionState(editor);
+  if (!child) {
+    return editor;
+  }
   const {
     items
   } = child;
@@ -6771,12 +6880,26 @@ const selectIndex = (editor, index) => {
 
 const selectCurrent = editor => {
   const child = getCompletionState(editor);
+  if (!child) {
+    return editor;
+  }
   const {
     focusedIndex
   } = child;
   return selectIndex(editor, focusedIndex);
 };
 
+const toggleDetails = editor => {
+  const child = getCompletionState(editor);
+  if (!child) {
+    return editor;
+  }
+  // TODO when completion details are open, close them
+  // TODO when completion details are opening, close them
+  // TODO when completion details are closed, open them
+  return editor;
+};
+
 const executeHoverProvider = (editor, offset) => {
   object(editor);
   number$1(offset);
@@ -6799,7 +6922,7 @@ const getHover = async (editor, offset) => {
 
 let _ipc;
 const listen$5 = async () => {
-  const ipc = await create$1({
+  const ipc = await create$4({
     method: RendererProcess
   });
   handleIpc(ipc);
@@ -7123,7 +7246,7 @@ const renderHoverDom = {
     return [/* method */'Viewlet.setDom2', dom];
   }
 };
-const renderBounds$1 = {
+const renderBounds$2 = {
   isEqual(oldState, newState) {
     return oldState.x === newState.x && oldState.y === newState.y && oldState.resizedWidth === newState.resizedWidth;
   },
@@ -7141,10 +7264,10 @@ const renderBounds$1 = {
     return [SetBounds, x, y, resizedWidth, height];
   }
 };
-const render$3 = [renderHoverDom, renderBounds$1];
+const render$5 = [renderHoverDom, renderBounds$2];
 const renderHover = async (oldState, newState) => {
   const commands = [];
-  for (const item of render$3) {
+  for (const item of render$5) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -8262,7 +8385,7 @@ const renderItems = {
     return ['setDom', dom];
   }
 };
-const renderBounds = {
+const renderBounds$1 = {
   isEqual(oldState, newState) {
     return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.x === newState.x && oldState.y === newState.y;
   },
@@ -8308,10 +8431,10 @@ const renderScrollBar = {
     return [/* method */SetScrollBar, /* scrollBarY */scrollBarY, /* scrollBarHeight */scrollBarHeight];
   }
 };
-const render$2 = [renderItems, renderBounds, renderHeight, renderNegativeMargin, renderScrollBar];
+const render$4 = [renderItems, renderBounds$1, renderHeight, renderNegativeMargin, renderScrollBar];
 const renderCompletion = (oldState, newState) => {
   const commands = [];
-  for (const item of render$2) {
+  for (const item of render$4) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -8319,7 +8442,7 @@ const renderCompletion = (oldState, newState) => {
   return commands;
 };
 
-const render$1 = (oldState, newState) => {
+const render$3 = (oldState, newState) => {
   const commands = renderCompletion(oldState, newState);
   const wrappedCommands = [];
   const uid = newState.uid;
@@ -8328,8 +8451,8 @@ const render$1 = (oldState, newState) => {
   }
   return wrappedCommands;
 };
-const add = widget => {
-  const commands = render$1(widget.oldState, widget.newState);
+const add$1 = widget => {
+  const commands = render$3(widget.oldState, widget.newState);
   const id = 'EditorCompletion';
   // TODO how to generate a unique integer id
   // that doesn't collide with ids created in renderer worker?
@@ -8339,7 +8462,7 @@ const add = widget => {
   allCommands.push(...commands);
   return allCommands;
 };
-const remove = widget => {
+const remove$1 = widget => {
   return [['Viewlet.send', widget.newState.uid, 'dispose']];
 };
 const handleEditorType = (editor, state) => {
@@ -8406,11 +8529,85 @@ const handleEditorDeleteLeft = (editor, state) => {
 
 const EditorCompletionWidget = {
   __proto__: null,
-  add,
+  add: add$1,
   handleEditorDeleteLeft,
   handleEditorType,
-  remove,
-  render: render$1
+  remove: remove$1,
+  render: render$3
+};
+
+const getCompletionDetailVirtualDom = content => {
+  const dom = [{
+    type: Div,
+    childCount: 2
+  }, {
+    type: Div,
+    className: 'CompletionDetailContent',
+    childCount: 1
+  }, text(content), {
+    type: Div,
+    className: 'CompletionDetailCloseButton',
+    childCount: 0
+  }];
+  return dom;
+};
+
+const renderContent = {
+  isEqual(oldState, newState) {
+    return oldState.content === newState.content;
+  },
+  apply(oldState, newState) {
+    const dom = getCompletionDetailVirtualDom(newState.content);
+    return ['setDom', dom];
+  }
+};
+const renderBounds = {
+  isEqual(oldState, newState) {
+    return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
+  },
+  apply(oldState, newState) {
+    const {
+      x,
+      y,
+      width,
+      height
+    } = newState;
+    return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
+  }
+};
+const render$2 = [renderContent, renderBounds];
+const renderFull = (oldState, newState) => {
+  const commands = [];
+  for (const item of render$2) {
+    if (!item.isEqual(oldState, newState)) {
+      commands.push(item.apply(oldState, newState));
+    }
+  }
+  return commands;
+};
+
+const render$1 = (oldState, newState) => {
+  const commands = renderFull(oldState, newState);
+  const wrappedCommands = [];
+  const uid = newState.uid;
+  for (const command of commands) {
+    wrappedCommands.push(['Viewlet.send', uid, ...command]);
+  }
+  return wrappedCommands;
+};
+const add = widget => {
+  const commands = render$1(widget.oldState, widget.newState);
+  const id = 'EditorCompletionDetails';
+  // TODO how to generate a unique integer id
+  // that doesn't collide with ids created in renderer worker?
+  const uid = widget.newState.uid;
+  const allCommands = [];
+  allCommands.push(['Viewlet.create', id, uid]);
+  allCommands.push(...commands);
+  return allCommands;
+};
+const remove = widget => {
+  return [['Viewlet.send', widget.newState.uid, 'dispose']];
 };
 
 const addWidget = widget => {
@@ -8419,6 +8616,8 @@ const addWidget = widget => {
   } = widget;
   switch (id) {
     case Completion:
+      return add$1(widget);
+    case CompletionDetail:
       return add(widget);
     default:
       throw new Error('unsupported widget');
@@ -8430,6 +8629,8 @@ const renderWidget = widget => {
   } = widget;
   switch (id) {
     case Completion:
+      return render$3(widget.oldState, widget.newState);
+    case CompletionDetail:
       return render$1(widget.oldState, widget.newState);
     default:
       throw new Error(`unsupported widget`);
@@ -8441,6 +8642,8 @@ const removeWidget = widget => {
   } = widget;
   switch (id) {
     case Completion:
+      return remove$1(widget);
+    case CompletionDetail:
       return remove(widget);
     default:
       throw new Error('unsupported widget');
@@ -8783,6 +8986,7 @@ const commandMap = {
   'Editor.undo': undo,
   'Editor.unIndent': editorUnindent,
   'EditorCompletion.advance': advance,
+  'EditorCompletion.closeDetails': closeDetails,
   'EditorCompletion.focusFirst': focusFirst$1,
   'EditorCompletion.focusIndex': focusIndex$1,
   'EditorCompletion.focusNext': focusNext$1,
@@ -8792,8 +8996,10 @@ const commandMap = {
   'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft$1,
   'EditorCompletion.handleEditorType': handleEditorType$1,
   'EditorCompletion.loadContent': loadContent$2,
+  'EditorCompletion.openDetails': openDetails,
   'EditorCompletion.selectCurrent': selectCurrent,
   'EditorCompletion.selectIndex': selectIndex,
+  'EditorCompletion.toggleDetails': toggleDetails,
   'FindWidget.focusFirst': focusFirst,
   'FindWidget.focusIndex': focusIndex,
   'FindWidget.focusLast': focusLast,

package/package.json

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