@lvce-editor/find-widget-worker 1.8.0 → 1.10.0

package/dist/findWidgetWorkerMain.js

@@ -470,6 +470,16 @@ const constructError = (message, type, name) => {
   }
   return new ErrorConstructor(message);
 };
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+const splitLines = lines => {
+  return lines.split(NewLine);
+};
+const getCurrentStack = () => {
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(2));
+  return currentStack;
+};
 const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine, startIndex);
 };
@@ -480,19 +490,16 @@ const getParentStack = error => {
   }
   return parentStack;
 };
-const joinLines = lines => {
-  return lines.join(NewLine);
-};
 const MethodNotFound = -32601;
 const Custom = -32001;
-const splitLines = lines => {
-  return lines.split(NewLine);
-};
 const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine + currentStack;
+    }
     return error;
   }
-  const currentStack = joinLines(splitLines(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -573,6 +580,17 @@ const getErrorType = prettyError => {
   }
   return undefined;
 };
+const isAlreadyStack = line => {
+  return line.trim().startsWith('at ');
+};
+const getStack = prettyError => {
+  const stackString = prettyError.stack || '';
+  const newLineIndex = stackString.indexOf('\n');
+  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
+    return stackString.slice(newLineIndex + 1);
+  }
+  return stackString;
+};
 const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
@@ -585,7 +603,7 @@ const getErrorProperty = (error, prettyError) => {
     code: Custom,
     message: prettyError.message,
     data: {
-      stack: prettyError.stack,
+      stack: getStack(prettyError),
       codeFrame: prettyError.codeFrame,
       type: getErrorType(prettyError),
       code: prettyError.code,
@@ -593,18 +611,18 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$1 = (message, error) => {
+const create$1$1 = (id, error) => {
   return {
     jsonrpc: Two,
-    id: message.id,
+    id,
     error
   };
 };
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
+const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(message, errorProperty);
+  return create$1$1(id, errorProperty);
 };
 const create$5 = (message, result) => {
   return {
@@ -617,12 +635,27 @@ const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
   return create$5(message, resultProperty);
 };
+const getErrorResponseSimple = (id, error) => {
+  return {
+    jsonrpc: Two,
+    id,
+    error: {
+      code: Custom,
+      // @ts-ignore
+      message: error.message,
+      data: error
+    }
+  };
+};
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
     const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
     return getSuccessResponse(message, result);
   } catch (error) {
-    return getErrorResponse(message, error, preparePrettyError, logError);
+    if (ipc.canUseSimpleErrorResponse) {
+      return getErrorResponseSimple(message.id, error);
+    }
+    return getErrorResponse(message.id, error, preparePrettyError, logError);
   }
 };
 const defaultPreparePrettyError = error => {
@@ -677,7 +710,7 @@ const handleJsonRpcMessage = async (...args) => {
       try {
         ipc.send(response);
       } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
+        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
         ipc.send(errorResponse);
       }
       return;
@@ -981,36 +1014,77 @@ const focusCloseButton = state => {
   return setFindWidgetFocus(state, FocusFindWidgetCloseButton);
 };
 
-// TODO don't call renderer worker, set editor state
-// TODO this function should be synchronous
-const focusIndex = (state, index) => {
+const rpcs = Object.create(null);
+const set$f = (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
+    invoke(method, ...params) {
+      const rpc = get(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$f(rpcId, rpc);
+    },
+    async dispose() {
+      const rpc = get(rpcId);
+      await rpc.dispose();
+    }
+  };
+};
+const EditorWorker$1 = 99;
+const {
+  invoke: invoke$c,
+  set: set$c} = create(EditorWorker$1);
+const EditorWorker = {
+  __proto__: null,
+  invoke: invoke$c,
+  set: set$c
+};
+
+const {
+  invoke,
+  set} = EditorWorker;
+
+const setSelections = async (editorUid, selections) => {
+  // @ts-ignore
+  await invoke('Editor.setSelections2', editorUid, selections);
+};
+
+const focusIndex = async (state, index) => {
   const {
-    matchIndex
+    matchIndex,
+    matches,
+    editorUid,
+    value
   } = state;
   if (index === matchIndex) {
     return state;
   }
-  // TODO update editor
-  // const { widgets } = editor
-  // const childIndex = widgets.findIndex(isFind)
-  // const childWidget = widgets[childIndex]
-
   // // TODO find next match and highlight it
-  // const matchRowIndex = matches[index * 2]
-  // const matchColumnIndex = matches[index * 2 + 1]
-  // const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length])
-  // const newState: FindWidgetState = {
-  //   ...findState,
-  //   matchIndex: index,
-  // }
-  // const newWidget = {
-  //   ...childWidget,
-  //   newState,
-  // }
-  // const newWidgets = [...widgets.slice(0, childIndex), newWidget, ...widgets.slice(childIndex + 1)]
+  const matchRowIndex = matches[index * 2];
+  const matchColumnIndex = matches[index * 2 + 1];
+  const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length]);
+  await setSelections(editorUid, newSelections);
   return {
     ...state,
-    matchIndex: index
+    matchIndex: index,
+    selections: [...newSelections]
   };
 };
 const focusFirst = state => {
@@ -1058,50 +1132,6 @@ const handleBlur = async state => {
   };
 };
 
-const rpcs = Object.create(null);
-const set$a = (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
-    invoke(method, ...params) {
-      const rpc = get(rpcId);
-      // @ts-ignore
-      return rpc.invoke(method, ...params);
-    },
-    // @ts-ignore
-    invokeAndTransfer(method, ...params) {
-      const rpc = get(rpcId);
-      // @ts-ignore
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    set(rpc) {
-      set$a(rpcId, rpc);
-    }
-  };
-};
-const EditorWorker$1 = 99;
-const {
-  invoke: invoke$9,
-  set: set$9
-} = create(EditorWorker$1);
-const EditorWorker = {
-  __proto__: null,
-  invoke: invoke$9,
-  set: set$9
-};
-
-const {
-  invoke,
-  set} = EditorWorker;
-
 const close$1 = async state => {
   const {
     editorUid
@@ -1287,6 +1317,10 @@ const loadContent = async state => {
   };
 };
 
+const preventDefaultBrowserFind = state => {
+  return state;
+};
+
 const SetBounds = 'Viewlet.setBounds';
 const SetDom2 = 'Viewlet.setDom2';
 const SetUid = 'Viewlet.setUid';
@@ -1305,7 +1339,6 @@ const renderBounds = (oldState, newState) => {
 
 const HandleBlur = 'handleBlur';
 const HandleClickClose = 'handleClickClose';
-const HandleClickFocusPreviousMatch = 'handleClickFocusPreviousMatch';
 const HandleClickNextMatch = 'handleClickNextMatch';
 const HandleClickPreviousMatch = 'handleClickPreviousMatch';
 const HandleClickReplace = 'handleClickReplace';
@@ -1658,11 +1691,11 @@ const getEventListeners = (uid, widgetId) => {
     name: HandleClickClose,
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickClose', 0, widgetId]
   }, {
-    name: HandleClickFocusPreviousMatch,
-    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickPreviousMatch', 0, widgetId]
+    name: HandleClickPreviousMatch,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.focusPrevious', 0, widgetId]
   }, {
     name: HandleClickNextMatch,
-    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickNextMatch', 0, widgetId]
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.focusNext', 0, widgetId]
   }, {
     name: HandleClickReplace,
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickReplace', 0, widgetId]
@@ -1793,6 +1826,7 @@ const commandMap = {
   'FindWidget.handleClickClose': wrapCommand(handleClickClose),
   'FindWidget.handleInput': wrapCommand(handleInput),
   'FindWidget.loadContent': wrapCommand(loadContent),
+  'FindWidget.preventDefaultBrowserFind': wrapCommand(preventDefaultBrowserFind),
   'FindWidget.render2': render2,
   'FindWidget.terminate': terminate,
   'FindWidget.toggleReplace': wrapCommand(toggleReplace)

package/package.json

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