@lvce-editor/source-control-worker 1.14.0 → 1.15.0

package/dist/sourceControlWorkerMain.js

@@ -344,22 +344,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
   });
@@ -438,7 +427,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   const {
     resolve,
     promise
-  } = withResolvers();
+  } = Promise.withResolvers();
   const listenerMap = Object.create(null);
   const cleanup = value => {
     for (const event of Object.keys(eventMap)) {
@@ -516,7 +505,7 @@ const IpcParentWithMessagePort$1 = {
 };
 
 const Two = '2.0';
-const create$4 = (method, params) => {
+const create$4$1 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -524,7 +513,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$5 = (id, fn) => {
+const set$4 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$3 = id => {
@@ -534,16 +523,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$5(id, resolve);
+  set$4(id, resolve);
   return {
     id,
     promise
@@ -616,6 +605,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);
 };
@@ -626,19 +625,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);
@@ -719,6 +715,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 {
@@ -731,7 +738,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,
@@ -851,7 +858,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   return unwrapJsonRpcResult(responseMessage);
 };
 const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
+  const message = create$4$1(method, params);
   transport.send(message);
 };
 const invoke$3 = (ipc, method, ...params) => {
@@ -928,7 +935,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$2 = async ({
+const create$3 = async ({
   commandMap,
   messagePort
 }) => {
@@ -944,11 +951,20 @@ const create$2 = async ({
   messagePort.start();
   return rpc;
 };
+const create$2 = async ({
+  commandMap,
+  messagePort
+}) => {
+  return create$3({
+    commandMap,
+    messagePort
+  });
+};
 const PlainMessagePortRpcParent = {
   __proto__: null,
   create: create$2
 };
-const create$1 = async ({
+const create$4 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -960,10 +976,10 @@ const create$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1
+  create: create$4
 };
 
-const create = () => {
+const create$1 = () => {
   const states = Object.create(null);
   return {
     get(uid) {
@@ -1024,9 +1040,9 @@ const create = () => {
 
 const {
   get: get$2,
-  set: set$4,
+  set: set$3,
   wrapCommand
-} = create();
+} = create$1();
 
 const create2 = (id, uri, x, y, width, height, workspacePath) => {
   const state = {
@@ -1064,7 +1080,7 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     x,
     y
   };
-  set$4(id, state, state);
+  set$3(id, state, state);
 };
 
 const RenderItems = 4;
@@ -1097,53 +1113,70 @@ const diff2 = uid => {
   return result;
 };
 
-const commandIds = ['acceptInput', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'refresh', 'handleClickSourceControlButtons', 'handleClick', 'handleClickAt', 'handleFocus', 'handleIconThemeChange', 'handleMouseOut', 'handleMouseOutAt', 'handleMouseOver', 'handleMouseOverAt', 'handleWheel', 'selectIndex'];
+const commandIds = ['acceptInput', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getInfo', 'handleClick', 'handleClickAt', 'handleClickSourceControlButtons', 'handleFocus', 'handleIconThemeChange', 'handleMouseOut', 'handleMouseOutAt', 'handleMouseOver', 'handleMouseOverAt', 'handleWheel', 'refresh', 'selectIndex'];
 
 const getCommandIds = () => {
   return commandIds;
 };
 
+const getInfo = uid => {
+  const {
+    newState
+  } = get$2(uid);
+  return newState.allGroups;
+};
+
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$b = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
   return rpcs[id];
 };
-const RendererWorker$1 = 1;
-const ExtensionHostWorker = 44;
-const invoke$2 = (method, ...params) => {
-  const rpc = get$1(RendererWorker$1);
-  // @ts-ignore
-  return rpc.invoke(method, ...params);
-};
-const invokeAndTransfer$2 = (method, ...params) => {
-  const rpc = get$1(RendererWorker$1);
-  // @ts-ignore
-  return rpc.invokeAndTransfer(method, ...params);
+
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+
+const create = rpcId => {
+  return {
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get$1(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get$1(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$b(rpcId, rpc);
+    }
+  };
 };
-const set$2 = rpc => {
-  set$3(RendererWorker$1, rpc);
+const ExtensionHostWorker = 44;
+const RendererWorker$1 = 1;
+const {
+  invoke: invoke$7,
+  set: set$7
+} = create(ExtensionHostWorker);
+const ExtensionHost = {
+  __proto__: null,
+  invoke: invoke$7,
+  set: set$7
 };
+const {
+  invoke: invoke$2,
+  invokeAndTransfer: invokeAndTransfer$2,
+  set: set$2
+} = create(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
   invoke: invoke$2,
   invokeAndTransfer: invokeAndTransfer$2,
   set: set$2
 };
-const invoke$1$1 = (method, ...params) => {
-  const rpc = get$1(ExtensionHostWorker);
-  // @ts-ignore
-  return rpc.invoke(method, ...params);
-};
-const set$1$1 = rpc => {
-  set$3(ExtensionHostWorker, rpc);
-};
-const ExtensionHost = {
-  __proto__: null,
-  invoke: invoke$1$1,
-  set: set$1$1
-};
 
 const {
   invoke: invoke$1,
@@ -2194,7 +2227,7 @@ const render2 = (uid, diffResult) => {
     oldState,
     newState
   } = get$2(uid);
-  set$4(uid, newState, newState);
+  set$3(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2337,7 +2370,8 @@ const commandMap = {
   'SourceControl.selectIndex': wrapCommand(selectIndex),
   'SourceControl.setDeltaY': wrapCommand(setDeltaY),
   'SourceControl.terminate': terminate,
-  'SourceControl.updateIcons': wrapCommand(updateIcons)
+  'SourceControl.updateIcons': wrapCommand(updateIcons),
+  'SourceControl.getInfo': getInfo
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/source-control-worker",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"