@lvce-editor/completion-worker 1.21.0 → 1.23.0

package/dist/completionWorkerMain.js

@@ -552,7 +552,7 @@ const registerPromise = () => {
     promise
   };
 };
-const create$2$2 = (method, params) => {
+const create$2$1 = (method, params) => {
   const {
     id,
     promise
@@ -773,7 +773,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$6 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -782,7 +782,7 @@ const create$5 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$6(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -877,7 +877,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const {
     message,
     promise
-  } = create$2$2(method, params);
+  } = create$2$1(method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -964,7 +964,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$3 = async ({
+const create$5 = async ({
   commandMap,
   messagePort
 }) => {
@@ -980,18 +980,23 @@ const create$3 = async ({
   messagePort.start();
   return rpc;
 };
-const create$2$1 = async ({
+const create$3 = async ({
   commandMap,
-  messagePort
+  send
 }) => {
-  return create$3({
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$5({
     commandMap,
-    messagePort
+    messagePort: port2
   });
 };
-const PlainMessagePortRpcParent = {
+const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$2$1
+  create: create$3
 };
 const create$4 = async ({
   commandMap
@@ -1008,6 +1013,90 @@ const WebWorkerRpcClient = {
   create: create$4
 };
 
+const toCommandId = key => {
+  const dotIndex = key.indexOf('.');
+  return key.slice(dotIndex + 1);
+};
+const create$2 = () => {
+  const states = Object.create(null);
+  const commandMapRef = {};
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (newState === newerState) {
+          return;
+        }
+        const latest = states[uid];
+        states[uid] = {
+          oldState: latest.oldState,
+          newState: newerState
+        };
+      };
+      return wrapped;
+    },
+    wrapGetter(fn) {
+      const wrapped = (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        return fn(newState, ...args);
+      };
+      return wrapped;
+    },
+    diff(uid, modules, numbers) {
+      const {
+        oldState,
+        newState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    }
+  };
+};
+const terminate = () => {
+  globalThis.close();
+};
+
 const rpcs = Object.create(null);
 const set$g = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1018,7 +1107,7 @@ const get$1 = id => {
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
 
-const create$2 = rpcId => {
+const create$1 = rpcId => {
   return {
     // @ts-ignore
     invoke(method, ...params) {
@@ -1041,21 +1130,78 @@ const create$2 = rpcId => {
     }
   };
 };
-const EditorWorker$1 = 99;
+const EditorWorker$2 = 99;
 const ExtensionHostWorker = 44;
 const {
   invoke: invoke$d,
   invokeAndTransfer: invokeAndTransfer$c,
-  set: set$c} = create$2(EditorWorker$1);
-const EditorWorker = {
+  set: set$c,
+  dispose: dispose$c
+} = create$1(EditorWorker$2);
+const sendMessagePortToExtensionHostWorker$1$1 = async port => {
+  const command = 'HandleMessagePort.handleMessagePort2';
+  await invokeAndTransfer$c(
+  // @ts-ignore
+  'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, 0 // TODO
+  );
+};
+
+// TODO add tests for this
+const activateByEvent$1$1 = async event => {
+  // @ts-ignore
+  await invoke$d('ActivateByEvent.activateByEvent', event);
+};
+const applyEdit$2 = async (editorUid, changes) => {
+  // @ts-ignore
+  await EditorWorker.invoke('Editor.applyEdit2', editorUid, changes);
+};
+const closeWidget$1 = async (editorUid, widgetId, widgetName, focusId) => {
+  // @ts-ignore
+  await invoke$d('Editor.closeWidget2', editorUid, widgetId, widgetName, focusId);
+};
+const getWordAt$1 = async (uid, rowIndex, columnIndex) => {
+  // @ts-ignore
+  const word = await invoke$d('Editor.getWordAt2', uid, rowIndex, columnIndex);
+  return word;
+};
+const getLines$2 = async editorUid => {
+  const lines = await invoke$d('Editor.getLines2', editorUid);
+  return lines;
+};
+const getPositionAtCursor$2 = async parentUid => {
+  const position = await invoke$d('Editor.getPositionAtCursor', parentUid);
+  return position;
+};
+const getSelections$2 = async editorUid => {
+  const selections = await invoke$d('Editor.getSelections2', editorUid);
+  return selections;
+};
+const getWordAtOffset2$1 = async editorUid => {
+  return invoke$d('Editor.getWordAtOffset2', editorUid);
+};
+const getWordBefore$2 = async (editorUid, rowIndex, columnIndex) => {
+  return invoke$d('Editor.getWordBefore2', editorUid, rowIndex, columnIndex);
+};
+const EditorWorker$1$1 = {
   __proto__: null,
+  activateByEvent: activateByEvent$1$1,
+  applyEdit: applyEdit$2,
+  closeWidget: closeWidget$1,
+  dispose: dispose$c,
+  getLines: getLines$2,
+  getPositionAtCursor: getPositionAtCursor$2,
+  getSelections: getSelections$2,
+  getWordAt: getWordAt$1,
+  getWordAtOffset2: getWordAtOffset2$1,
+  getWordBefore: getWordBefore$2,
   invoke: invoke$d,
   invokeAndTransfer: invokeAndTransfer$c,
+  sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1$1,
   set: set$c
 };
 const {
   invoke: invoke$a,
-  set: set$9} = create$2(ExtensionHostWorker);
+  set: set$9} = create$1(ExtensionHostWorker);
 const ExtensionHost = {
   __proto__: null,
   invoke: invoke$a,
@@ -1065,7 +1211,37 @@ const ExtensionHost = {
 const {
   invoke: invoke$1,
   set: set$2,
-  invokeAndTransfer} = EditorWorker;
+  dispose: dispose$2,
+  sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1,
+  activateByEvent: activateByEvent$1,
+  applyEdit: applyEdit$1,
+  closeWidget,
+  getLines: getLines$1,
+  getPositionAtCursor: getPositionAtCursor$1,
+  getSelections: getSelections$1,
+  getWordAt,
+  getWordAtOffset2,
+  getWordBefore: getWordBefore$1,
+  invokeAndTransfer
+} = EditorWorker$1$1;
+
+const EditorWorker$1 = {
+  __proto__: null,
+  activateByEvent: activateByEvent$1,
+  applyEdit: applyEdit$1,
+  closeWidget,
+  dispose: dispose$2,
+  getLines: getLines$1,
+  getPositionAtCursor: getPositionAtCursor$1,
+  getSelections: getSelections$1,
+  getWordAt,
+  getWordAtOffset2,
+  getWordBefore: getWordBefore$1,
+  invoke: invoke$1,
+  invokeAndTransfer,
+  sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1,
+  set: set$2
+};
 
 const FocusEditorCompletions = 9;
 const FocusEditorRename = 11;
@@ -1076,76 +1252,16 @@ const close = async state => {
   const {
     editorUid
   } = state;
-  // @ts-ignore
-  await invoke$1('Editor.closeWidget2', editorUid, Completion, 'Completions', FocusEditorCompletions);
+  await closeWidget(editorUid, Completion, 'Completions', FocusEditorCompletions);
   return state;
 };
 
-const create$1 = () => {
-  const states = Object.create(null);
-  return {
-    get(uid) {
-      return states[uid];
-    },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
-    },
-    dispose(uid) {
-      delete states[uid];
-    },
-    getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseInt(key);
-      });
-    },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
-    },
-    wrapCommand(fn) {
-      const wrapped = async (uid, ...args) => {
-        const {
-          newState
-        } = states[uid];
-        const newerState = await fn(newState, ...args);
-        if (newState === newerState) {
-          return;
-        }
-        const latest = states[uid];
-        states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
-        };
-      };
-      return wrapped;
-    },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
-        }
-      }
-      return diffResult;
-    }
-  };
-};
-
 const {
   get,
   set: set$1,
   wrapCommand,
   dispose: dispose$1
-} = create$1();
+} = create$2();
 
 const create = (uid, x, y, width, height, editorUid, editorLanguageId) => {
   const state = {
@@ -1265,15 +1381,13 @@ const applyEdit = async (editorUid, changes) => {
   await invoke$1('Editor.applyEdit2', editorUid, changes);
 };
 
-const getLines = async editorUid => {
-  const lines = await invoke$1('Editor.getLines2', editorUid);
-  return lines;
-};
+const {
+  getLines
+} = EditorWorker$1;
 
-const getSelections = async editorUid => {
-  const selections = await invoke$1('Editor.getSelections2', editorUid);
-  return selections;
-};
+const {
+  getSelections
+} = EditorWorker$1;
 
 const getSelectionPairs = (selections, i) => {
   const first = selections[i];
@@ -1331,11 +1445,9 @@ const OnCompletion = 'onCompletion';
 const CompletionExecute = 'ExtensionHostCompletion.execute';
 const CompletionResolveExecute = 'ExtensionHostCompletion.executeResolve';
 
-// TODO add tests for this
-const activateByEvent = async event => {
-  // @ts-ignore
-  await invoke$1('ActivateByEvent.activateByEvent', event);
-};
+const {
+  activateByEvent
+} = EditorWorker$1;
 
 const {
   invoke,
@@ -1732,14 +1844,11 @@ const getListHeight = (itemsLength, itemHeight, maxHeight) => {
   return Math.min(totalHeight, maxHeight);
 };
 
-const getPositionAtCursor = async parentUid => {
-  const position = await invoke$1('Editor.getPositionAtCursor', parentUid);
-  return position;
-};
+const {
+  getPositionAtCursor
+} = EditorWorker$1;
 
-const getWordAtOffset = async editorUid => {
-  return invoke$1('Editor.getWordAtOffset2', editorUid);
-};
+const getWordAtOffset = getWordAtOffset2;
 
 const handleEditorDeleteLeft = async state => {
   const {
@@ -1774,9 +1883,9 @@ const handleEditorDeleteLeft = async state => {
   };
 };
 
-const getWordBefore = async (editorUid, rowIndex, columnIndex) => {
-  return invoke$1('Editor.getWordBefore2', editorUid, rowIndex, columnIndex);
-};
+const {
+  getWordBefore
+} = EditorWorker$1;
 
 const handleEditorType = async state => {
   const {
@@ -1880,36 +1989,15 @@ const handleWheel = (state, deltaMode, deltaY) => {
   return setDeltaY(state, state.deltaY + deltaY);
 };
 
-const getPortTuple = () => {
-  const {
-    port1,
-    port2
-  } = new MessageChannel();
-  return {
-    port1,
-    port2
-  };
-};
-
-const sendMessagePortToExtensionHostWorker = async port => {
-  const command = 'HandleMessagePort.handleMessagePort2';
-  // @ts-ignore
-  await invokeAndTransfer(
-  // @ts-ignore
-  'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, 0 // TODO
-  );
-};
+const {
+  sendMessagePortToExtensionHostWorker
+} = EditorWorker$1;
 
 const createExtensionHostRpc = async () => {
   try {
-    const {
-      port1,
-      port2
-    } = getPortTuple();
-    await sendMessagePortToExtensionHostWorker(port2);
-    const rpc = await PlainMessagePortRpcParent.create({
+    const rpc = await TransferMessagePortRpcParent.create({
       commandMap: {},
-      messagePort: port1
+      send: sendMessagePortToExtensionHostWorker
     });
     return rpc;
   } catch (error) {
@@ -1924,6 +2012,7 @@ const initialize = async () => {
 
 const error = message => {
   // TODO send this to error worker for logging
+  // @ts-ignore
   console.error(message);
 };
 
@@ -2395,10 +2484,6 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
-const terminate = () => {
-  globalThis.close();
-};
-
 const commandMap = {
   'Completions.close': wrapCommand(close),
   'Completions.create': create,

package/package.json

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