@lvce-editor/about-view 7.0.0 → 7.1.0

package/dist/aboutWorkerMain.js

@@ -182,8 +182,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -206,14 +206,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -232,8 +232,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -243,8 +243,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -305,8 +305,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -326,8 +326,8 @@ const listen$6 = async () => {
   const type = firstMessage.params[0];
   if (type === 'message-port') {
     parentIpc.send({
-      jsonrpc: '2.0',
       id: firstMessage.id,
+      jsonrpc: '2.0',
       result: null
     });
     parentIpc.dispose();
@@ -369,56 +369,14 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   wrap: wrap$e
 };
 
-const Two = '2.0';
-const create$4 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set$3 = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get$2 = id => {
   return callbacks[id];
 };
 const remove = id => {
   delete callbacks[id];
 };
-let id = 0;
-const create$3$1 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$3(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$1 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -612,9 +570,9 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$1 = (id, error) => {
+const create$1$2 = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error
   };
@@ -623,22 +581,22 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(id, errorProperty);
+  return create$1$2(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$3 = (message, result) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id: message.id,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$3(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -725,29 +683,6 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$1(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
-  transport.send(message);
-};
-const invoke$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -770,24 +705,87 @@ const execute = (command, ...args) => {
   return fn(...args);
 };
 
+const Two = '2.0';
+const create$o = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const create$n = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+let id = 0;
+const create$m = () => {
+  return ++id;
+};
+
+/* eslint-disable n/no-unsupported-features/es-syntax */
+
+const registerPromise = map => {
+  const id = create$m();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+// @ts-ignore
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$n(id, method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$o(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -804,7 +802,7 @@ const logError = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -822,7 +820,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$3 = async ({
+const create$1$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -834,21 +832,11 @@ const create$3 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$3
+  create: create$1$1
 };
 
-const Button$2 = 1;
-const Div = 4;
-const Text = 12;
-const Br = 55;
-
 const TargetName = 'event.target.name';
 
-const Tab = 2;
-const Escape = 8;
-
-const Shift = 1 << 10 >>> 0;
-
 const RendererWorker = 1;
 
 const rpcs = Object.create(null);
@@ -861,6 +849,10 @@ const get$1 = id => {
 
 const create$2 = rpcId => {
   return {
+    async dispose() {
+      const rpc = get$1(rpcId);
+      await rpc.dispose();
+    },
     // @ts-ignore
     invoke(method, ...params) {
       const rpc = get$1(rpcId);
@@ -875,17 +867,14 @@ const create$2 = rpcId => {
     },
     set(rpc) {
       set$2(rpcId, rpc);
-    },
-    async dispose() {
-      const rpc = get$1(rpcId);
-      await rpc.dispose();
     }
   };
 };
 
 const {
   invoke,
-  set: set$1} = create$2(RendererWorker);
+  set: set$1
+} = create$2(RendererWorker);
 const getElectronVersion$1 = async () => {
   return invoke('Process.getElectronVersion');
 };
@@ -950,10 +939,11 @@ const create$1 = () => {
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
+          oldState,
           newState
         } = states[uid];
         const newerState = await fn(newState, ...args);
-        if (newState === newerState) {
+        if (oldState === newerState || newState === newerState) {
           return;
         }
         const latest = states[uid];
@@ -999,20 +989,20 @@ const create$1 = () => {
 };
 
 const {
-  get,
-  set,
   dispose: dispose$1,
-  wrapCommand,
+  get,
+  getCommandIds,
   registerCommands,
-  getCommandIds
+  set,
+  wrapCommand
 } = create$1();
 
 const create = uid => {
   const state = {
-    uid,
     focusId: 0,
     lines: [],
-    productName: ''
+    productName: '',
+    uid
   };
   set(uid, state, state);
 };
@@ -1052,8 +1042,8 @@ const diff = (oldState, newState) => {
 
 const diff2 = uid => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get(uid);
   const diffResult = diff(oldState, newState);
   return diffResult;
@@ -1069,10 +1059,10 @@ const Copy$2 = 2;
 
 const getNextFocus = focusId => {
   switch (focusId) {
-    case Ok$2:
-      return Copy$2;
     case Copy$2:
       return Ok$2;
+    case Ok$2:
+      return Copy$2;
     default:
       return None;
   }
@@ -1090,10 +1080,10 @@ const focusNext = state => {
 
 const getPreviousFocus = focusId => {
   switch (focusId) {
-    case Ok$2:
-      return Copy$2;
     case Copy$2:
       return Ok$2;
+    case Ok$2:
+      return Copy$2;
     default:
       return None;
   }
@@ -1109,6 +1099,16 @@ const focusPrevious = state => {
   };
 };
 
+const Button$2 = 1;
+const Div = 4;
+const Text = 12;
+const Br = 55;
+
+const Tab = 2;
+const Escape = 8;
+
+const Shift = 1 << 10 >>> 0;
+
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -1125,16 +1125,16 @@ const FocusAbout = 4;
 
 const getKeyBindings = () => {
   return [{
-    key: Escape,
     command: 'About.handleClickClose',
+    key: Escape,
     when: FocusAbout
   }, {
-    key: Tab,
     command: 'About.focusNext',
+    key: Tab,
     when: FocusAbout
   }, {
-    key: Tab | Shift,
     command: 'About.focusPrevious',
+    key: Tab | Shift,
     when: FocusAbout
   }];
 };
@@ -1187,12 +1187,12 @@ const Close = 'Close';
 
 const handleClickButton = async (state, name) => {
   switch (name) {
+    case Close:
+      return handleClickClose(state);
     case Copy$1:
       return handleClickCopy(state);
     case Ok$1:
       return handleClickOk(state);
-    case Close:
-      return handleClickClose(state);
     default:
       throw new Error(`unexpected button`);
   }
@@ -1532,9 +1532,9 @@ const loadContent2 = state => {
   const lines = getDetailStringWeb();
   return {
     ...state,
-    productName: productNameLong$1,
+    focusId: Ok$2,
     lines,
-    focusId: Ok$2
+    productName: productNameLong$1
   };
 };
 
@@ -1562,16 +1562,16 @@ const createViewModel = state => {
   const closeMessage = closeDialog();
   const infoMessage = info();
   const {
-    productName,
-    lines
+    lines,
+    productName
   } = state;
   return {
-    productName,
-    lines,
     closeMessage,
-    okMessage,
     copyMessage,
-    infoMessage
+    infoMessage,
+    lines,
+    okMessage,
+    productName
   };
 };
 
@@ -1600,8 +1600,8 @@ const HandleContextMenu = 5;
 const HandleFocusIn = 6;
 
 const br = {
-  type: Br,
-  childCount: 0
+  childCount: 0,
+  type: Br
 };
 const renderLine = (line, index) => {
   if (index === 0) {
@@ -1612,9 +1612,9 @@ const renderLine = (line, index) => {
 
 const getAboutContentVirtualDom = lines => {
   const dom = [{
-    type: Div,
+    childCount: lines.length * 2 - 1,
     className: DialogMessage,
-    childCount: lines.length * 2 - 1
+    type: Div
   }, ...lines.flatMap(renderLine)];
   return dom;
 };
@@ -1626,21 +1626,21 @@ const Dialog = 'dialog';
 
 const getPrimaryButtonVirtualDom = (message, name) => {
   return [{
-    type: Button$2,
+    childCount: 1,
     className: mergeClassNames(Button$1, ButtonPrimary),
+    name,
     onClick: HandleClickButton,
-    childCount: 1,
-    name
+    type: Button$2
   }, text(message)];
 };
 
 const getSecondaryButtonVirtualDom = (message, name) => {
   return [{
-    type: Button$2,
+    childCount: 1,
     className: mergeClassNames(Button$1, ButtonSecondary),
+    name,
     onClick: HandleClickButton,
-    childCount: 1,
-    name
+    type: Button$2
   }, text(message)];
 };
 
@@ -1655,52 +1655,52 @@ const Focusable = -1;
 
 const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copyMessage, productName) => {
   const dom = [{
-    type: Div,
-    className: DialogContent,
-    tabIndex: Focusable,
-    role: Dialog,
-    ariaModal: True,
     ariaLabelledBy: joinBySpace(DialogIcon, DialogHeading),
+    ariaModal: True,
+    childCount: 3,
+    className: DialogContent,
     onFocusIn: HandleFocusIn,
-    childCount: 3
+    role: Dialog,
+    tabIndex: Focusable,
+    type: Div
   }, {
-    type: Div,
+    childCount: 1,
     className: DialogToolBarRow,
-    childCount: 1
+    type: Div
   }, {
-    type: Div,
-    className: DialogClose,
     ariaLabel: closeMessage,
-    role: Button,
+    childCount: 1,
+    className: DialogClose,
     onClick: HandleClickClose,
-    childCount: 1
+    role: Button,
+    type: Div
   }, {
-    type: Div,
+    childCount: 0,
     className: mergeClassNames(MaskIcon, MaskIconClose),
-    childCount: 0
+    type: Div
   }, {
-    type: Div,
+    childCount: 2,
     className: DialogMessageRow,
-    childCount: 2
+    type: Div
   }, {
-    type: Div,
+    ariaLabel: infoMessage,
+    childCount: 0,
     className: mergeClassNames(DialogIcon$1, DialogInfoIcon, MaskIcon, MaskIconInfo),
     id: DialogIcon,
-    ariaLabel: infoMessage,
-    childCount: 0
+    type: Div
   }, {
-    type: Div,
+    childCount: 2,
     className: DialogContentRight,
-    childCount: 2
+    type: Div
   }, {
-    type: Div,
-    id: DialogHeading,
+    childCount: 1,
     className: DialogHeading$1,
-    childCount: 1
+    id: DialogHeading,
+    type: Div
   }, text(productName), ...content, {
-    type: Div,
+    childCount: 2,
     className: DialogButtonsRow,
-    childCount: 2
+    type: Div
   }, ...getSecondaryButtonVirtualDom(okMessage, Ok$1), ...getPrimaryButtonVirtualDom(copyMessage, Copy$1)];
   return dom;
 };
@@ -1708,10 +1708,10 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
 const getAboutVirtualDom = (productName, lines, closeMessage, okMessage, copyMessage, infoMessage) => {
   const content = getAboutContentVirtualDom(lines);
   return [{
-    type: Div,
+    childCount: 1,
     className: mergeClassNames(Viewlet, About),
     onContextMenu: HandleContextMenu,
-    childCount: 1
+    type: Div
   }, ...getDialogVirtualDom(content, closeMessage, infoMessage, okMessage, copyMessage, productName)];
 };
 
@@ -1765,8 +1765,8 @@ const applyRender = (oldState, newState, diffResult) => {
 
 const doRender = (uid, diffResult) => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get(uid);
   set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
@@ -1830,11 +1830,11 @@ const showAboutElectron = async () => {
   const detail = await getDetailString();
   const productNameLong = getProductNameLong();
   const options = {
-    windowId,
-    message: productNameLong,
     buttons: [copy(), ok()],
+    detail,
+    message: productNameLong,
     type: Info,
-    detail
+    windowId
   };
   const index = await showMessageBox(options);
   switch (index) {

package/package.json

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