@lvce-editor/find-widget-worker 1.11.0 → 1.13.0

package/dist/findWidgetWorkerMain.js

@@ -378,7 +378,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
+const set$4 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -397,7 +397,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$2(id, resolve);
+  set$4(id, resolve);
   return {
     id,
     promise
@@ -477,7 +477,8 @@ const splitLines = lines => {
   return lines.split(NewLine);
 };
 const getCurrentStack = () => {
-  const currentStack = joinLines(splitLines(new Error().stack || '').slice(2));
+  const stackLinesToSkip = 3;
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(stackLinesToSkip));
   return currentStack;
 };
 const getNewLineIndex = (string, startIndex = undefined) => {
@@ -741,13 +742,19 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke$1 = (ipc, method, ...params) => {
+const invoke$2 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer = (ipc, method, ...params) => {
+const invokeAndTransfer$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
 const commands = Object.create(null);
 const register = commandMap => {
   Object.assign(commands, commandMap);
@@ -758,7 +765,7 @@ const getCommand = key => {
 const execute = (command, ...args) => {
   const fn = getCommand(command);
   if (!fn) {
-    throw new Error(`command not found ${command}`);
+    throw new CommandNotFoundError(command);
   }
   return fn(...args);
 };
@@ -774,10 +781,10 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
+      return invoke$2(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer(ipc, method, ...params);
+      return invokeAndTransfer$1(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -829,9 +836,30 @@ const WebWorkerRpcClient = {
   __proto__: null,
   create: create$3
 };
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    return command(...params);
+  };
+  const mockRpc = {
+    invoke,
+    invokeAndTransfer: invoke,
+    invocations
+  };
+  return mockRpc;
+};
 
+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];
@@ -872,6 +900,15 @@ const create$2 = () => {
       };
       return wrapped;
     },
+    wrapGetter(fn) {
+      const wrapped = (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        return fn(newState, ...args);
+      };
+      return wrapped;
+    },
     diff(uid, modules, numbers) {
       const {
         oldState,
@@ -885,15 +922,28 @@ const create$2 = () => {
         }
       }
       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 {
   get: get$1,
-  set: set$1,
+  set: set$3,
   wrapCommand,
-  dispose: dispose$1
+  dispose: dispose$2,
+  getCommandIds,
+  registerCommands
 } = create$2();
 
 const Script$1 = 2;
@@ -929,7 +979,7 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
     editorHeight: height,
     inputSource: 0
   };
-  set$1(uid, state, state);
+  set$3(uid, state, state);
   return state;
 };
 
@@ -961,8 +1011,19 @@ const RenderFocusContext = 14;
 const RenderFocus = 15;
 const RenderValue = 16;
 
+const Button = 1;
+const Div = 4;
+const Text = 12;
+const TextArea = 62;
+
+const User = 1;
 const Script = 1;
-const User = 2;
+
+const EditorWorker$1 = 99;
+
+const FocusSelector = 'Viewlet.focusSelector';
+const SetFocusContext = 'Viewlet.setFocusContext';
+const SetValueByName = 'Viewlet.setValueByName';
 
 const isEqual = (oldState, newState) => {
   return newState.inputSource === User || oldState.value === newState.value;
@@ -991,8 +1052,8 @@ const diff2 = uid => {
   return diffResult;
 };
 
-const dispose = uid => {
-  return dispose$1(uid);
+const dispose$1 = uid => {
+  return dispose$2(uid);
 };
 
 const FocusFindWidgetCloseButton = 48;
@@ -1015,15 +1076,13 @@ const focusCloseButton = state => {
 };
 
 const rpcs = Object.create(null);
-const set$g = (id, rpc) => {
+const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
   return rpcs[id];
 };
 
-/* eslint-disable  @typescript-eslint/explicit-function-return-type */
-
 const create = rpcId => {
   return {
     // @ts-ignore
@@ -1039,7 +1098,7 @@ const create = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$g(rpcId, rpc);
+      set$2(rpcId, rpc);
     },
     async dispose() {
       const rpc = get(rpcId);
@@ -1047,14 +1106,109 @@ const create = rpcId => {
     }
   };
 };
-const EditorWorker$1 = 99;
+
 const {
-  invoke: invoke$d,
-  set: set$c} = create(EditorWorker$1);
+  invoke: invoke$1,
+  invokeAndTransfer,
+  set: set$1,
+  dispose
+} = create(EditorWorker$1);
+const sendMessagePortToExtensionHostWorker = async port => {
+  const command = 'HandleMessagePort.handleMessagePort2';
+  await invokeAndTransfer(
+  // @ts-ignore
+  'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, 0);
+};
+// TODO add tests for this
+const activateByEvent = async event => {
+  // @ts-ignore
+  await invoke$1('ActivateByEvent.activateByEvent', event);
+};
+const applyEdit = async (editorUid, changes) => {
+  // @ts-ignore
+  await invoke$1('Editor.applyEdit2', editorUid, changes);
+};
+const applyWorkspaceEdit = async (editorUid, changes) => {
+  // @ts-ignore
+  await invoke$1('Editor.applyWorkspaceEdit', editorUid, changes);
+};
+const closeWidget = async (editorUid, widgetId, widgetName, focusId) => {
+  // @ts-ignore
+  await invoke$1('Editor.closeWidget2', editorUid, widgetId, widgetName, focusId);
+};
+const getWordAt = async (uid, rowIndex, columnIndex) => {
+  // @ts-ignore
+  const word = await invoke$1('Editor.getWordAt2', uid, rowIndex, columnIndex);
+  return word;
+};
+const getLines$1 = async editorUid => {
+  const lines = await invoke$1('Editor.getLines2', editorUid);
+  return lines;
+};
+const getPositionAtCursor = async parentUid => {
+  const position = await invoke$1('Editor.getPositionAtCursor', parentUid);
+  return position;
+};
+const getOffsetAtCursor = async editorId => {
+  // @ts-ignore
+  return await invoke$1('Editor.getOffsetAtCursor', editorId);
+};
+const getSelections$1 = async editorUid => {
+  const selections = await invoke$1('Editor.getSelections2', editorUid);
+  return selections;
+};
+const getWordAtOffset2 = async editorUid => {
+  return invoke$1('Editor.getWordAtOffset2', editorUid);
+};
+const getWordBefore = async (editorUid, rowIndex, columnIndex) => {
+  return invoke$1('Editor.getWordBefore2', editorUid, rowIndex, columnIndex);
+};
+const updateDebugInfo = async info => {
+  await invoke$1('Editor.updateDebugInfo', info);
+};
+const getUri = async editorUid => {
+  // @ts-ignore
+  return invoke$1('Editor.getUri', editorUid);
+};
+const getLanguageId = async editorUid => {
+  // @ts-ignore
+  return invoke$1('Editor.getLanguageId', editorUid);
+};
+const getProblems = async () => {
+  // @ts-ignore
+  return invoke$1('Editor.getProblems');
+};
+const registerMockRpc = commandMap => {
+  const mockRpc = createMockRpc({
+    commandMap
+  });
+  set$1(mockRpc);
+  return mockRpc;
+};
+
 const EditorWorker = {
   __proto__: null,
-  invoke: invoke$d,
-  set: set$c
+  activateByEvent,
+  applyEdit,
+  applyWorkspaceEdit,
+  closeWidget,
+  dispose,
+  getLanguageId,
+  getLines: getLines$1,
+  getOffsetAtCursor,
+  getPositionAtCursor,
+  getProblems,
+  getSelections: getSelections$1,
+  getUri,
+  getWordAt,
+  getWordAtOffset2,
+  getWordBefore,
+  invoke: invoke$1,
+  invokeAndTransfer,
+  registerMockRpc,
+  sendMessagePortToExtensionHostWorker,
+  set: set$1,
+  updateDebugInfo
 };
 
 const {
@@ -1190,7 +1344,7 @@ const getMatchCount = matches => {
   return matches.length / 2;
 };
 
-const refresh$1 = (state, value) => {
+const refresh$1 = (state, value, inputSource) => {
   const {
     lines
   } = state;
@@ -1202,16 +1356,16 @@ const refresh$1 = (state, value) => {
     matchIndex: 0,
     matchCount,
     value,
-    inputSource: User
+    inputSource
   };
 };
 
-const refresh = (state, value = state.value) => {
-  return refresh$1(state, value);
+const refresh = (state, value = state.value, inputSource = User) => {
+  return refresh$1(state, value, inputSource);
 };
 
-const handleInput = (state, value) => {
-  return refresh(state, value);
+const handleInput = (state, value, inputSource = User) => {
+  return refresh(state, value, inputSource);
 };
 
 const getFindWidgetHeight = replaceExpanded => {
@@ -1234,12 +1388,6 @@ const toggleReplace = state => {
   };
 };
 
-const commandIds = ['handleSliderPointerDown', 'handleSliderPointerMove'];
-
-const getCommandIds = () => {
-  return commandIds;
-};
-
 const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
   const width = 300;
   const height = 30;
@@ -1463,6 +1611,18 @@ const getFindWidgetButtonsEnabled = (matchCount, value) => {
   };
 };
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
+const text = data => {
+  return {
+    type: Text,
+    text: data,
+    childCount: 0
+  };
+};
+
 const CheckBox = 'checkbox';
 const Group = 'group';
 const None = 'none';
@@ -1485,18 +1645,6 @@ const ViewletFind = 'ViewletFind';
 const FindWidget = 'FindWidget';
 const ViewletFindWidget = 'ViewletFindWidget';
 
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-const Text = 12;
-const text = data => {
-  return {
-    type: Text,
-    text: data,
-    childCount: 0
-  };
-};
-
 const getFindMatchCountClassName = (matchCount, value) => {
   if (value && matchCount === 0) {
     return mergeClassNames(FindWidgetMatchCount, FindWidgetMatchCountEmpty);
@@ -1504,10 +1652,6 @@ const getFindMatchCountClassName = (matchCount, value) => {
   return FindWidgetMatchCount;
 };
 
-const Button = 1;
-const Div = 4;
-const TextArea = 62;
-
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
@@ -1740,13 +1884,13 @@ const renderFocus = (oldState, newState) => {
   const {
     uid
   } = newState;
-  return [/* method */'Viewlet.focusSelector', uid, `[name="search-value"]`];
+  return [/* method */FocusSelector, uid, `[name="search-value"]`];
 };
 
 const FocusFindWidget = 16;
 
 const renderFocusContext = (oldState, newState) => {
-  return [/* method */'Viewlet.setFocusContext', FocusFindWidget];
+  return [/* method */SetFocusContext, FocusFindWidget];
 };
 
 const renderUid = (oldState, newState) => {
@@ -1762,7 +1906,7 @@ const renderValue = (oldState, newState) => {
     uid,
     value
   } = newState;
-  return [/* method */'Viewlet.setValueByName', uid, SearchValue, value];
+  return [SetValueByName, uid, SearchValue, value];
 };
 
 const getRenderer = diffType => {
@@ -1800,19 +1944,15 @@ const render2 = (uid, diffResult) => {
     oldState,
     newState
   } = get$1(uid);
-  set$1(uid, newState, newState);
+  set$3(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 
-const terminate = () => {
-  globalThis.close();
-};
-
 const commandMap = {
   'FindWidget.create': create$1,
   'FindWidget.diff2': diff2,
-  'FindWidget.dispose': dispose,
+  'FindWidget.dispose': dispose$1,
   'FindWidget.focusCloseButton': wrapCommand(focusCloseButton),
   'FindWidget.focusFirst': wrapCommand(focusFirst),
   'FindWidget.focusIndex': wrapCommand(focusIndex),
@@ -1833,6 +1973,7 @@ const commandMap = {
 };
 
 const listen = async () => {
+  registerCommands(commandMap);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });

package/package.json

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