@lvce-editor/extension-search-view 3.6.0 → 3.8.0

package/dist/extensionSearchViewWorkerMain.js

@@ -60,37 +60,45 @@ class AssertionError extends Error {
     this.name = 'AssertionError';
   }
 }
+const Object$1 = 1;
+const Number$1 = 2;
+const Array$1 = 3;
+const String = 4;
+const Boolean$1 = 5;
+const Function = 6;
+const Null = 7;
+const Unknown = 8;
 const getType = value => {
   switch (typeof value) {
     case 'number':
-      return 'number';
+      return Number$1;
     case 'function':
-      return 'function';
+      return Function;
     case 'string':
-      return 'string';
+      return String;
     case 'object':
       if (value === null) {
-        return 'null';
+        return Null;
       }
       if (Array.isArray(value)) {
-        return 'array';
+        return Array$1;
       }
-      return 'object';
+      return Object$1;
     case 'boolean':
-      return 'boolean';
+      return Boolean$1;
     default:
-      return 'unknown';
+      return Unknown;
   }
 };
 const object = value => {
   const type = getType(value);
-  if (type !== 'object') {
+  if (type !== Object$1) {
     throw new AssertionError('expected value to be of type object');
   }
 };
 const number = value => {
   const type = getType(value);
-  if (type !== 'number') {
+  if (type !== Number$1) {
     throw new AssertionError('expected value to be of type number');
   }
 };
@@ -344,22 +352,11 @@ class IpcChildWithModuleWorker extends Ipc {
 const wrap$f = global => {
   return new IpcChildWithModuleWorker(global);
 };
-const withResolvers = () => {
-  let _resolve;
-  const promise = new Promise(resolve => {
-    _resolve = resolve;
-  });
-  return {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    resolve: _resolve,
-    promise
-  };
-};
 const waitForFirstMessage = async port => {
   const {
     resolve,
     promise
-  } = withResolvers();
+  } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
   });
@@ -430,7 +427,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$4 = (id, fn) => {
+const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -440,16 +437,16 @@ const remove = id => {
   delete callbacks[id];
 };
 let id = 0;
-const create$3 = () => {
+const create$3$1 = () => {
   return ++id;
 };
 const registerPromise = () => {
-  const id = create$3();
+  const id = create$3$1();
   const {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$4(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
@@ -522,6 +519,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);
 };
@@ -532,19 +539,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);
@@ -625,6 +629,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 {
@@ -637,7 +652,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,
@@ -645,18 +660,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 {
@@ -669,12 +684,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 => {
@@ -729,7 +759,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;
@@ -834,7 +864,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$2 = async ({
+const create$3 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -846,10 +876,73 @@ const create$2 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$2
+  create: create$3
+};
+
+const create$2 = () => {
+  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 terminate = () => {
+  globalThis.close();
 };
 
-const handleError = (error, notify = true, prefix = '') => {
+const handleError = async (error, notify = true, prefix = '') => {
+  // @ts-ignore
   console.error(error);
 };
 
@@ -1110,7 +1203,8 @@ const handleInput = async (state, value) => {
     // TODO handle out of order responses (a bit complicated)
     // for now just assume everything comes back in order
   } catch (error) {
-    handleError(error);
+    // TODO send error to error worker
+    await handleError(error);
     return {
       ...state,
       searchValue: value,
@@ -1127,73 +1221,14 @@ const closeSuggest = state => {
   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: get$1,
   set: set$1,
   dispose: dispose$1,
   wrapCommand
-} = create$1();
+} = create$2();
 
-const create = (id, uri, x, y, width, height, platform, assetDir) => {
+const create$1 = (id, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     allExtensions: [],
     assetDir,
@@ -1551,34 +1586,78 @@ const handleBlur = state => {
 };
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$g = (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$g(rpcId, rpc);
+    },
+    async dispose() {
+      const rpc = get(rpcId);
+      await rpc.dispose();
+    }
+  };
+};
 const RendererWorker$1 = 1;
-const invoke$2 = (method, ...params) => {
-  const rpc = get(RendererWorker$1);
-  // @ts-ignore
-  return rpc.invoke(method, ...params);
+const {
+  invoke: invoke$3,
+  set: set$3} = create(RendererWorker$1);
+const showContextMenu$1 = async (x, y, id, ...args) => {
+  return invoke$3('ContextMenu.show', x, y, id, ...args);
 };
-const set$2 = rpc => {
-  set$3(RendererWorker$1, rpc);
+const setFocus$2 = key => {
+  return invoke$3('Focus.setFocus', key);
 };
-const RendererWorker = {
-  __proto__: null,
-  invoke: invoke$2,
-  set: set$2
+const openUri$2 = async (uri, focus, options) => {
+  await invoke$3('Main.openUri', uri, focus, options);
 };
+const RendererWorker$2 = {
+  __proto__: null,
+  invoke: invoke$3,
+  openUri: openUri$2,
+  set: set$3,
+  setFocus: setFocus$2,
+  showContextMenu: showContextMenu$1};
 
 const {
   invoke,
-  set
-} = RendererWorker;
+  set,
+  showContextMenu,
+  setFocus: setFocus$1,
+  openUri: openUri$1
+} = RendererWorker$2;
+
+const RendererWorker = {
+  __proto__: null,
+  invoke,
+  openUri: openUri$1,
+  set,
+  setFocus: setFocus$1,
+  showContextMenu
+};
 
 const openUri = async uri => {
-  return invoke('Main.openUri', uri);
+  return openUri$1(uri);
 };
 
 const handleClick = async (state, index) => {
@@ -1635,7 +1714,7 @@ const show = async (x, y, id) => {
   number(x);
   number(y);
   number(id);
-  await invoke('ContextMenu.show', x, y, id);
+  await showContextMenu(x, y, id);
 };
 
 const ManageExtension = 8;
@@ -1655,9 +1734,9 @@ const handleEnable = (state, id) => {
   return state;
 };
 
-const setFocus = async focusId => {
-  await invoke('Focus.setFocus', focusId);
-};
+const {
+  setFocus
+} = RendererWorker;
 
 const handleFocus = async state => {
   await setFocus(FocusExtensions);
@@ -2436,10 +2515,6 @@ const scrollDown = state => {
   return setDeltaY(state, newDeltaY);
 };
 
-const terminate = () => {
-  globalThis.close();
-};
-
 const toggleSuggest = state => {
   return state;
 };
@@ -2447,7 +2522,7 @@ const toggleSuggest = state => {
 const commandMap = {
   'SearchExtensions.clearSearchResults': wrapCommand(clearSearchResults),
   'SearchExtensions.closeSuggest': wrapCommand(closeSuggest),
-  'SearchExtensions.create': create,
+  'SearchExtensions.create': create$1,
   'SearchExtensions.diff2': diff2,
   'SearchExtensions.dispose': dispose,
   'SearchExtensions.focusFirst': wrapCommand(focusFirst),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-search-view",
-  "version": "3.6.0",
+  "version": "3.8.0",
   "description": "Extension Search View Worker",
   "license": "MIT",
   "author": "Lvce Editor",