@lvce-editor/about-view 5.5.0 → 5.7.0

package/dist/aboutWorkerMain.js

@@ -303,22 +303,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
   });
@@ -389,7 +378,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$4 = (id, fn) => {
+const set$3 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -399,16 +388,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$3(id, resolve);
   return {
     id,
     promise
@@ -481,6 +470,16 @@ const constructError = (message, type, name) => {
   }
   return new ErrorConstructor(message);
 };
+const joinLines$1 = lines => {
+  return lines.join(NewLine$1);
+};
+const splitLines = lines => {
+  return lines.split(NewLine$1);
+};
+const getCurrentStack = () => {
+  const currentStack = joinLines$1(splitLines(new Error().stack || '').slice(2));
+  return currentStack;
+};
 const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine$1, startIndex);
 };
@@ -491,19 +490,16 @@ const getParentStack = error => {
   }
   return parentStack;
 };
-const joinLines$1 = lines => {
-  return lines.join(NewLine$1);
-};
 const MethodNotFound = -32601;
 const Custom = -32001;
-const splitLines = lines => {
-  return lines.split(NewLine$1);
-};
 const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine$1 + currentStack;
+    }
     return error;
   }
-  const currentStack = joinLines$1(splitLines(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -584,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 {
@@ -596,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,
@@ -719,7 +726,7 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke$2 = (ipc, method, ...params) => {
+const invoke$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer = (ipc, method, ...params) => {
@@ -752,7 +759,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$2(ipc, method, ...params);
+      return invoke$1(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -793,7 +800,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
@@ -805,10 +812,10 @@ const create$2 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$2
+  create: create$3
 };
 
-const create$1 = () => {
+const create$2 = () => {
   const states = Object.create(null);
   return {
     get(uid) {
@@ -869,19 +876,19 @@ const create$1 = () => {
 
 const {
   get: get$1,
-  set: set$3,
+  set: set$1,
   dispose: dispose$1,
   wrapCommand
-} = create$1();
+} = create$2();
 
-const create = uid => {
+const create$1 = uid => {
   const state = {
     uid,
     focusId: 0,
     lines: [],
     productName: ''
   };
-  set$3(uid, state, state);
+  set$1(uid, state, state);
 };
 
 const RenderFocus = 2;
@@ -976,7 +983,7 @@ const focusPrevious = state => {
   };
 };
 
-const commandIds = ['dispose', 'handleClickClose', 'handleClickOk', 'handleClickCopy', 'handleFocusIn', 'focusNext', 'focusPrevious'];
+const commandIds = ['dispose', 'focusNext', 'focusPrevious', 'handleClickButton', 'handleClickClose', 'handleClickCopy', 'handleClickOk', 'handleFocusIn'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -1006,25 +1013,43 @@ const getKeyBindings = () => {
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$b = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
   return rpcs[id];
 };
-const RendererWorker$1 = 1;
-const invoke$1 = (method, ...params) => {
-  const rpc = get(RendererWorker$1);
-  // @ts-ignore
-  return rpc.invoke(method, ...params);
-};
-const set$1 = rpc => {
-  set$2(RendererWorker$1, rpc);
+
+/* 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$b(rpcId, rpc);
+    }
+  };
 };
+const RendererWorker$1 = 1;
+const {
+  invoke: invoke$2,
+  set: set$2
+} = create(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
-  invoke: invoke$1,
-  set: set$1
+  invoke: invoke$2,
+  set: set$2
 };
 
 const {
@@ -1032,8 +1057,16 @@ const {
   set
 } = RendererWorker;
 
+const closeWidget = async id => {
+  await invoke('Viewlet.closeWidget', id);
+};
+
+const close = async () => {
+  await closeWidget('About');
+};
+
 const handleClickClose = async state => {
-  await invoke('Viewlet.closeWidget', 'About');
+  await close();
   return state;
 };
 
@@ -1047,24 +1080,42 @@ const joinLines = lines => {
   return lines.join(NewLine);
 };
 
+const copy$1 = async lines => {
+  const message = joinLines(lines);
+  await writeText(message);
+};
+
 const handleClickCopy = async state => {
   const {
     lines
   } = state;
-  const message = joinLines(lines);
-  await writeText(message);
+  await copy$1(lines);
+  await close();
   return state;
 };
 
-const closeWidget = async id => {
-  await invoke('Viewlet.closeWidget', id);
-};
-
 const handleClickOk = async state => {
-  await closeWidget('About');
+  await close();
   return state;
 };
 
+const Ok$1 = 'Ok';
+const Copy$1 = 'Copy';
+const Close = 'Close';
+
+const handleClickButton = async (state, name) => {
+  switch (name) {
+    case Copy$1:
+      return handleClickCopy(state);
+    case Ok$1:
+      return handleClickOk(state);
+    case Close:
+      return handleClickClose(state);
+    default:
+      throw new Error(`unexpected button`);
+  }
+};
+
 const handleFocusIn = async state => {
   // TODO remove side effect
   await invoke('Focus.setFocus', FocusAbout);
@@ -1430,19 +1481,19 @@ const loadContent2 = uid => {
     lines,
     focusId: Ok$2
   };
-  set$3(uid, oldState, newState);
+  set$1(uid, oldState, newState);
 };
 
-const Ok$1 = 'Ok';
-const Copy$1 = 'Copy';
+const Ok = 'Ok';
+const Copy = 'Copy';
 const Info$1 = 'Info';
 const CloseDialog = 'Close Dialog';
 
 const ok = () => {
-  return i18nString(Ok$1);
+  return i18nString(Ok);
 };
 const copy = () => {
-  return i18nString(Copy$1);
+  return i18nString(Copy);
 };
 const info = () => {
   return i18nString(Info$1);
@@ -1489,11 +1540,10 @@ const DialogIcon$1 = 'DialogIcon';
 const DialogInfoIcon = 'DialogInfoIcon';
 const MaskIconInfo = 'MaskIconInfo';
 
-const HandleClickClose = 'handleClickClose';
-const HandleClickCopy = 'handleClickCopy';
-const HandleClickOk = 'handleClickOk';
-const HandleContextMenu = 'handleContextMenu';
-const HandleFocusIn = 'handleFocusIn';
+const HandleClickClose = 1;
+const HandleClickButton = 4;
+const HandleContextMenu = 5;
+const HandleFocusIn = 6;
 
 const Button$1 = 1;
 const Div = 4;
@@ -1536,21 +1586,21 @@ const True = 'true';
 const Button = 'button';
 const Dialog = 'dialog';
 
-const getPrimaryButtonVirtualDom = (message, onClick, name) => {
+const getPrimaryButtonVirtualDom = (message, name) => {
   return [{
     type: Button$1,
     className: mergeClassNames(Button$2, ButtonPrimary),
-    onClick,
+    onClick: HandleClickButton,
     childCount: 1,
     name
   }, text(message)];
 };
 
-const getSecondaryButtonVirtualDom = (message, onClick, name) => {
+const getSecondaryButtonVirtualDom = (message, name) => {
   return [{
     type: Button$1,
     className: mergeClassNames(Button$2, ButtonSecondary),
-    onClick,
+    onClick: HandleClickButton,
     childCount: 1,
     name
   }, text(message)];
@@ -1559,9 +1609,6 @@ const getSecondaryButtonVirtualDom = (message, onClick, name) => {
 const DialogIcon = 'DialogIcon';
 const DialogHeading = 'DialogHeading';
 
-const Ok = 'Ok';
-const Copy = 'Copy';
-
 const joinBySpace = (...items) => {
   return items.join(' ');
 };
@@ -1616,7 +1663,7 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     type: Div,
     className: DialogButtonsRow,
     childCount: 2
-  }, ...getSecondaryButtonVirtualDom(okMessage, HandleClickOk, Ok), ...getPrimaryButtonVirtualDom(copyMessage, HandleClickCopy, Copy)];
+  }, ...getSecondaryButtonVirtualDom(okMessage, Ok$1), ...getPrimaryButtonVirtualDom(copyMessage, Copy$1)];
   return dom;
 };
 
@@ -1639,9 +1686,9 @@ const renderDialog = (oldState, newState) => {
 const getFocusSelector = focusId => {
   switch (focusId) {
     case Copy$2:
-      return Copy;
+      return Copy$1;
     case Ok$2:
-      return Ok;
+      return Ok$1;
     default:
       return '';
   }
@@ -1683,21 +1730,18 @@ const doRender = (uid, diffResult) => {
     oldState,
     newState
   } = get$1(uid);
-  set$3(uid, newState, newState);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 
 const renderEventListeners = () => {
   return [{
-    name: HandleClickOk,
-    params: ['handleClickOk']
+    name: HandleClickButton,
+    params: ['handleClickButton', 'event.target.name']
   }, {
     name: HandleClickClose,
-    params: ['handleClickClose']
-  }, {
-    name: HandleClickCopy,
-    params: ['handleClickCopy']
+    params: ['handleClickClose'] // TODO
   }, {
     name: HandleFocusIn,
     params: ['handleFocusIn']
@@ -1780,13 +1824,14 @@ const showAbout = async platform => {
 };
 
 const commandMap = {
-  'About.create': create,
+  'About.create': create$1,
   'About.diff2': diff2,
   'About.dispose': dispose,
   'About.focusNext': wrapCommand(focusNext),
   'About.focusPrevious': wrapCommand(focusPrevious),
   'About.getCommandIds': getCommandIds,
   'About.getKeyBindings': getKeyBindings,
+  'About.handleClickButton': wrapCommand(handleClickButton),
   'About.handleClickClose': wrapCommand(handleClickClose),
   'About.handleClickCopy': wrapCommand(handleClickCopy),
   'About.handleClickOk': wrapCommand(handleClickOk),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/about-view",
-  "version": "5.5.0",
+  "version": "5.7.0",
   "description": "About View Worker",
   "keywords": [
     "about-view"