@lvce-editor/completion-worker 1.27.0 → 1.29.0

package/dist/completionWorkerMain.js

@@ -527,7 +527,7 @@ const create$4$1 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$6 = (id, fn) => {
+const set$5 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -546,7 +546,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$6(id, resolve);
+  set$5(id, resolve);
   return {
     id,
     promise
@@ -891,10 +891,10 @@ const send = (transport, method, ...params) => {
   const message = create$4$1(method, params);
   transport.send(message);
 };
-const invoke$4 = (ipc, method, ...params) => {
+const invoke$2 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer$3 = (ipc, method, ...params) => {
+const invokeAndTransfer$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -930,10 +930,10 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$4(ipc, method, ...params);
+      return invoke$2(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$3(ipc, method, ...params);
+      return invokeAndTransfer$1(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -1123,7 +1123,15 @@ const terminate = () => {
   globalThis.close();
 };
 
+const Div = 4;
+const Span = 8;
 const Text = 12;
+const Img = 17;
+
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const DeltaMode = 'event.deltaMode';
+const DeltaY = 'event.deltaY';
 
 const Enter = 3;
 const Escape = 8;
@@ -1139,7 +1147,7 @@ const EditorWorker$2 = 99;
 const ExtensionHostWorker = 44;
 
 const rpcs = Object.create(null);
-const set$5 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1161,7 +1169,7 @@ const create$1 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$5(rpcId, rpc);
+      set$4(rpcId, rpc);
     },
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1171,81 +1179,81 @@ const create$1 = rpcId => {
 };
 
 const {
-  invoke: invoke$3,
-  invokeAndTransfer: invokeAndTransfer$2,
-  set: set$4,
-  dispose: dispose$4
+  invoke: invoke$1,
+  invokeAndTransfer,
+  set: set$3,
+  dispose: dispose$2
 } = create$1(EditorWorker$2);
 const sendMessagePortToExtensionHostWorker$2 = async port => {
   const command = 'HandleMessagePort.handleMessagePort2';
-  await invokeAndTransfer$2(
+  await invokeAndTransfer(
   // @ts-ignore
   'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, 0);
 };
 // TODO add tests for this
 const activateByEvent$2 = async event => {
   // @ts-ignore
-  await invoke$3('ActivateByEvent.activateByEvent', event);
+  await invoke$1('ActivateByEvent.activateByEvent', event);
 };
 const applyEdit$2 = async (editorUid, changes) => {
   // @ts-ignore
-  await invoke$3('Editor.applyEdit2', editorUid, changes);
+  await invoke$1('Editor.applyEdit2', editorUid, changes);
 };
 const applyWorkspaceEdit = async (editorUid, changes) => {
   // @ts-ignore
-  await invoke$3('Editor.applyWorkspaceEdit', editorUid, changes);
+  await invoke$1('Editor.applyWorkspaceEdit', editorUid, changes);
 };
 const closeWidget$1 = async (editorUid, widgetId, widgetName, focusId) => {
   // @ts-ignore
-  await invoke$3('Editor.closeWidget2', editorUid, widgetId, widgetName, focusId);
+  await invoke$1('Editor.closeWidget2', editorUid, widgetId, widgetName, focusId);
 };
-const getWordAt$1 = async (uid, rowIndex, columnIndex) => {
+const getWordAt = async (uid, rowIndex, columnIndex) => {
   // @ts-ignore
-  const word = await invoke$3('Editor.getWordAt2', uid, rowIndex, columnIndex);
+  const word = await invoke$1('Editor.getWordAt2', uid, rowIndex, columnIndex);
   return word;
 };
 const getLines$2 = async editorUid => {
-  const lines = await invoke$3('Editor.getLines2', editorUid);
+  const lines = await invoke$1('Editor.getLines2', editorUid);
   return lines;
 };
 const getPositionAtCursor$2 = async parentUid => {
-  const position = await invoke$3('Editor.getPositionAtCursor', parentUid);
+  const position = await invoke$1('Editor.getPositionAtCursor', parentUid);
   return position;
 };
 const getOffsetAtCursor$2 = async editorId => {
   // @ts-ignore
-  return await invoke$3('Editor.getOffsetAtCursor', editorId);
+  return await invoke$1('Editor.getOffsetAtCursor', editorId);
 };
 const getSelections$2 = async editorUid => {
-  const selections = await invoke$3('Editor.getSelections2', editorUid);
+  const selections = await invoke$1('Editor.getSelections2', editorUid);
   return selections;
 };
 const getWordAtOffset2$1 = async editorUid => {
-  return invoke$3('Editor.getWordAtOffset2', editorUid);
+  return invoke$1('Editor.getWordAtOffset2', editorUid);
 };
 const getWordBefore$2 = async (editorUid, rowIndex, columnIndex) => {
-  return invoke$3('Editor.getWordBefore2', editorUid, rowIndex, columnIndex);
+  return invoke$1('Editor.getWordBefore2', editorUid, rowIndex, columnIndex);
 };
 const updateDebugInfo = async info => {
-  await invoke$3('Editor.updateDebugInfo', info);
+  await invoke$1('Editor.updateDebugInfo', info);
 };
 const getUri = async editorUid => {
   // @ts-ignore
-  return invoke$3('Editor.getUri', editorUid);
+  return invoke$1('Editor.getUri', editorUid);
 };
 const getLanguageId = async editorUid => {
   // @ts-ignore
-  return invoke$3('Editor.getLanguageId', editorUid);
+  return invoke$1('Editor.getLanguageId', editorUid);
 };
 const getProblems = async () => {
   // @ts-ignore
-  return invoke$3('Editor.getProblems');
+  return invoke$1('Editor.getProblems');
 };
-const registerMockRpc$1 = commandMap => {
+const registerMockRpc = commandMap => {
   const mockRpc = createMockRpc({
     commandMap
   });
-  set$4(mockRpc);
+  set$3(mockRpc);
   return mockRpc;
 };
 
@@ -1255,7 +1263,7 @@ const EditorWorker$1 = {
   applyEdit: applyEdit$2,
   applyWorkspaceEdit,
   closeWidget: closeWidget$1,
-  dispose: dispose$4,
+  dispose: dispose$2,
   getLanguageId,
   getLines: getLines$2,
   getOffsetAtCursor: getOffsetAtCursor$2,
@@ -1263,59 +1271,23 @@ const EditorWorker$1 = {
   getProblems,
   getSelections: getSelections$2,
   getUri,
-  getWordAt: getWordAt$1,
+  getWordAt,
   getWordAtOffset2: getWordAtOffset2$1,
   getWordBefore: getWordBefore$2,
-  invoke: invoke$3,
-  invokeAndTransfer: invokeAndTransfer$2,
-  registerMockRpc: registerMockRpc$1,
+  invoke: invoke$1,
+  invokeAndTransfer,
+  registerMockRpc,
   sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$2,
-  set: set$4,
+  set: set$3,
   updateDebugInfo
 };
 
 const {
-  invoke: invoke$2,
-  invokeAndTransfer: invokeAndTransfer$1,
-  set: set$3,
-  dispose: dispose$3
-} = create$1(ExtensionHostWorker);
-const executeReferenceProvider = async (id, offset) => {
-  // @ts-ignore
-  return invoke$2('ExtensionHostReference.executeReferenceProvider', id, offset);
-};
-const executeFileReferenceProvider = async id => {
-  // @ts-ignore
-  return invoke$2('ExtensionHostReference.executeFileReferenceProvider', id);
-};
-const getRuntimeStatus = async extensionId => {
-  // @ts-ignore
-  return invoke$2('ExtensionHost.getRuntimeStatus', extensionId);
-};
-const registerMockRpc = commandMap => {
-  const mockRpc = createMockRpc({
-    commandMap
-  });
-  set$3(mockRpc);
-  return mockRpc;
-};
-
-const ExtensionHost = {
-  __proto__: null,
-  dispose: dispose$3,
-  executeFileReferenceProvider,
-  executeReferenceProvider,
-  getRuntimeStatus,
-  invoke: invoke$2,
-  invokeAndTransfer: invokeAndTransfer$1,
-  registerMockRpc,
-  set: set$3
-};
+  invoke,
+  set: set$2} = create$1(ExtensionHostWorker);
 
 const {
-  invoke: invoke$1,
-  set: set$2,
-  dispose: dispose$2,
+  set: set$1,
   sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1,
   activateByEvent: activateByEvent$1,
   applyEdit: applyEdit$1,
@@ -1323,11 +1295,9 @@ const {
   getLines: getLines$1,
   getPositionAtCursor: getPositionAtCursor$1,
   getSelections: getSelections$1,
-  getWordAt,
   getOffsetAtCursor: getOffsetAtCursor$1,
   getWordAtOffset2,
-  getWordBefore: getWordBefore$1,
-  invokeAndTransfer
+  getWordBefore: getWordBefore$1
 } = EditorWorker$1;
 
 const EditorWorker = {
@@ -1335,18 +1305,14 @@ const EditorWorker = {
   activateByEvent: activateByEvent$1,
   applyEdit: applyEdit$1,
   closeWidget,
-  dispose: dispose$2,
   getLines: getLines$1,
   getOffsetAtCursor: getOffsetAtCursor$1,
   getPositionAtCursor: getPositionAtCursor$1,
   getSelections: getSelections$1,
-  getWordAt,
   getWordAtOffset2,
   getWordBefore: getWordBefore$1,
-  invoke: invoke$1,
-  invokeAndTransfer,
   sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1,
-  set: set$2
+  set: set$1
 };
 
 const FocusEditorCompletions = 9;
@@ -1364,7 +1330,7 @@ const close = async state => {
 
 const {
   get,
-  set: set$1,
+  set,
   wrapCommand,
   dispose: dispose$1
 } = create$2();
@@ -1393,7 +1359,7 @@ const create = (uid, x, y, width, height, editorUid, editorLanguageId) => {
     editorLanguageId,
     maxItems: 8
   };
-  set$1(uid, state, state);
+  set(uid, state, state);
 };
 
 const isEqual$4 = (oldState, newState) => {
@@ -1554,10 +1520,6 @@ const {
   activateByEvent
 } = EditorWorker;
 
-const {
-  invoke,
-  set} = ExtensionHost;
-
 const execute = async ({
   editorLanguageId,
   editorUid,
@@ -1997,6 +1959,26 @@ const handleEditorType = async state => {
   };
 };
 
+const getIndexFromPosition = (y, clientY, itemHeight) => {
+  const relativeY = clientY - y;
+  const index = Math.floor(relativeY / itemHeight);
+  return index;
+};
+
+const handlePointerDown = async (state, clientX, clientY) => {
+  const {
+    y,
+    itemHeight,
+    items
+  } = state;
+  const index = getIndexFromPosition(y, clientY, itemHeight);
+  if (index < 0 || index >= items.length) {
+    //  TODO close maybe?
+    return state;
+  }
+  return selectIndex(state, index);
+};
+
 const clamp = (num, min, max) => {
   number(num);
   number(min);
@@ -2085,7 +2067,7 @@ const createExtensionHostRpc = async () => {
 
 const initialize = async () => {
   const rpc = await createExtensionHostRpc();
-  set(rpc);
+  set$2(rpc);
 };
 
 const error = message => {
@@ -2178,13 +2160,18 @@ const renderContent = (oldState, newState) => {
   return [SetDom2, uid, dom];
 };
 
-const HandleWheel = 'handleWheel';
+const HandlePointerDown = 1;
+const HandleWheel = 2;
 
 const getEventListeners = () => {
   return [{
     name: HandleWheel,
-    params: ['EditorCompletion.handleWheel', 'event.deltaMode', 'event.deltaY'],
+    params: ['EditorCompletion.handleWheel', DeltaMode, DeltaY],
     passive: true
+  }, {
+    name: HandlePointerDown,
+    params: ['EditorCompletion.handlePoinerDown', ClientX, ClientY],
+    preventDefault: true
   }];
 };
 
@@ -2240,10 +2227,6 @@ const suggest = () => {
   return i18nString(Suggest);
 };
 
-const Div = 4;
-const Span = 8;
-const Img = 17;
-
 const getFileIconVirtualDom = icon => {
   return {
     type: Img,
@@ -2346,12 +2329,10 @@ const getCompletionItemsVirtualDom = visibleItems => {
   if (visibleItems.length === 0) {
     return getNoResultsVirtualDom();
   }
-  const root = {
+  return [{
     type: Div,
     childCount: visibleItems.length
-  };
-  const dom = [root, ...visibleItems.flatMap(getCompletionItemVirtualDom)];
-  return dom;
+  }, ...visibleItems.flatMap(getCompletionItemVirtualDom)];
 };
 
 const getScrollBarVirtualDom = (scrollBarHeight, scrollBarTop) => {
@@ -2557,7 +2538,7 @@ const render2 = (uid, diffResult) => {
     oldState,
     newState
   } = get(uid);
-  set$1(uid, newState, newState);
+  set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2576,6 +2557,7 @@ const commandMap = {
   'Completions.handleEditorDeleteLeft': wrapCommand(handleEditorDeleteLeft),
   'Completions.handleEditorType': wrapCommand(handleEditorType),
   'Completions.handleWheel': wrapCommand(handleWheel),
+  'Completions.handlePointerDown': wrapCommand(handlePointerDown),
   'Completions.initialize': initialize,
   'Completions.loadContent': wrapCommand(loadContent),
   'Completions.openDetails': wrapCommand(openDetails),
@@ -2589,7 +2571,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$2(rpc);
+  set$1(rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/completion-worker",
-  "version": "1.27.0",
+  "version": "1.29.0",
   "description": "Web Worker for the completion widget in Lvce Editor",
   "repository": {
     "type": "git",