@lvce-editor/about-view 5.11.0 → 6.0.0

package/dist/aboutWorkerMain.js

@@ -378,7 +378,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
+const set$3 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -397,7 +397,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$2(id, resolve);
+  set$3(id, resolve);
   return {
     id,
     promise
@@ -477,7 +477,8 @@ const splitLines = lines => {
   return lines.split(NewLine$1);
 };
 const getCurrentStack = () => {
-  const currentStack = joinLines$1(splitLines(new Error().stack || '').slice(2));
+  const stackLinesToSkip = 3;
+  const currentStack = joinLines$1(splitLines(new Error().stack || '').slice(stackLinesToSkip));
   return currentStack;
 };
 const getNewLineIndex = (string, startIndex = undefined) => {
@@ -741,13 +742,19 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke = (ipc, method, ...params) => {
+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) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
 const commands = Object.create(null);
 const register = commandMap => {
   Object.assign(commands, commandMap);
@@ -758,7 +765,7 @@ const getCommand = key => {
 const execute = (command, ...args) => {
   const fn = getCommand(command);
   if (!fn) {
-    throw new Error(`command not found ${command}`);
+    throw new CommandNotFoundError(command);
   }
   return fn(...args);
 };
@@ -774,7 +781,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke(ipc, method, ...params);
+      return invoke$1(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -830,8 +837,91 @@ const WebWorkerRpcClient = {
   create: create$3
 };
 
-const create$2 = () => {
+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 RendererWorker = 1;
+
+const rpcs = Object.create(null);
+const set$2 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get$1 = id => {
+  return rpcs[id];
+};
+
+const create$2 = 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$2(rpcId, rpc);
+    },
+    async dispose() {
+      const rpc = get$1(rpcId);
+      await rpc.dispose();
+    }
+  };
+};
+
+const {
+  invoke,
+  set: set$1} = create$2(RendererWorker);
+const getElectronVersion$1 = async () => {
+  return invoke('Process.getElectronVersion');
+};
+const getNodeVersion$1 = async () => {
+  return invoke('Process.getNodeVersion');
+};
+const getChromeVersion$1 = async () => {
+  return invoke('Process.getChromeVersion');
+};
+const getV8Version$1 = async () => {
+  return invoke('Process.getV8Version');
+};
+const setFocus = key => {
+  return invoke('Focus.setFocus', key);
+};
+const closeWidget$1 = async widgetId => {
+  return invoke('Viewlet.closeWidget', widgetId);
+};
+const writeClipBoardText = async text => {
+  await invoke('ClipBoard.writeText', /* text */text);
+};
+const showMessageBox$1 = async options => {
+  return invoke('ElectronDialog.showMessageBox', options);
+};
+const openWidget = async name => {
+  await invoke('Viewlet.openWidget', name);
+};
+const getWindowId$1 = async () => {
+  return invoke('GetWindowId.getWindowId');
+};
+
+const toCommandId = key => {
+  const dotIndex = key.indexOf('.');
+  return key.slice(dotIndex + 1);
+};
+const create$1 = () => {
   const states = Object.create(null);
+  const commandMapRef = {};
   return {
     get(uid) {
       return states[uid];
@@ -872,6 +962,15 @@ const create$2 = () => {
       };
       return wrapped;
     },
+    wrapGetter(fn) {
+      const wrapped = (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        return fn(newState, ...args);
+      };
+      return wrapped;
+    },
     diff(uid, modules, numbers) {
       const {
         oldState,
@@ -885,25 +984,35 @@ const create$2 = () => {
         }
       }
       return diffResult;
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
     }
   };
 };
 
 const {
-  get: get$1,
-  set: set$1,
+  get,
+  set,
   dispose: dispose$1,
-  wrapCommand
-} = create$2();
+  wrapCommand,
+  registerCommands,
+  getCommandIds
+} = create$1();
 
-const create$1 = uid => {
+const create = uid => {
   const state = {
     uid,
     focusId: 0,
     lines: [],
     productName: ''
   };
-  set$1(uid, state, state);
+  set(uid, state, state);
 };
 
 const RenderFocus = 2;
@@ -943,7 +1052,7 @@ const diff2 = uid => {
   const {
     oldState,
     newState
-  } = get$1(uid);
+  } = get(uid);
   const diffResult = diff(oldState, newState);
   return diffResult;
 };
@@ -998,34 +1107,10 @@ const focusPrevious = state => {
   };
 };
 
-const commandIds = ['dispose', 'focusNext', 'focusPrevious', 'handleClickButton', 'handleClickClose', 'handleClickCopy', 'handleClickOk', 'handleFocusIn'];
-
-const getCommandIds = () => {
-  return commandIds;
-};
-
-const Tab = 2;
-const Escape = 8;
-const KeyCode = {
-  __proto__: null,
-  Escape,
-  Tab};
-const Shift = 1 << 10 >>> 0;
-const KeyModifier = {
-  __proto__: null,
-  Shift};
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
-const Button$2 = 1;
-const Div = 4;
-const Text = 12;
-const Br = 55;
-const VirtualDomElements = {
-  __proto__: null,
-  Br,
-  Button: Button$2,
-  Div};
+
 const text = data => {
   return {
     type: Text,
@@ -1038,134 +1123,21 @@ const FocusAbout = 4;
 
 const getKeyBindings = () => {
   return [{
-    key: KeyCode.Escape,
+    key: Escape,
     command: 'About.handleClickClose',
     when: FocusAbout
   }, {
-    key: KeyCode.Tab,
+    key: Tab,
     command: 'About.focusNext',
     when: FocusAbout
   }, {
-    key: KeyCode.Tab | KeyModifier.Shift,
+    key: Tab | Shift,
     command: 'About.focusPrevious',
     when: FocusAbout
   }];
 };
 
-const rpcs = Object.create(null);
-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: invoke$4,
-  set: set$3} = create(RendererWorker$1);
-const getElectronVersion$2 = async () => {
-  return invoke$4('Process.getElectronVersion');
-};
-const getNodeVersion$2 = async () => {
-  return invoke$4('Process.getNodeVersion');
-};
-const getChromeVersion$2 = async () => {
-  return invoke$4('Process.getChromeVersion');
-};
-const getV8Version$2 = async () => {
-  return invoke$4('Process.getV8Version');
-};
-const setFocus$1 = key => {
-  return invoke$4('Focus.setFocus', key);
-};
-const closeWidget$2 = async widgetId => {
-  return invoke$4('Viewlet.closeWidget', widgetId);
-};
-const writeClipBoardText$1 = async text => {
-  await invoke$4('ClipBoard.writeText', /* text */text);
-};
-const showMessageBox$2 = async options => {
-  return invoke$4('ElectronDialog.showMessageBox', options);
-};
-const openWidget$1 = async name => {
-  await invoke$4('Viewlet.openWidget', name);
-};
-const getWindowId$2 = async () => {
-  return invoke$4('GetWindowId.getWindowId');
-};
-const RendererWorker$2 = {
-  __proto__: null,
-  closeWidget: closeWidget$2,
-  getChromeVersion: getChromeVersion$2,
-  getElectronVersion: getElectronVersion$2,
-  getNodeVersion: getNodeVersion$2,
-  getV8Version: getV8Version$2,
-  getWindowId: getWindowId$2,
-  openWidget: openWidget$1,
-  set: set$3,
-  setFocus: setFocus$1,
-  showMessageBox: showMessageBox$2,
-  writeClipBoardText: writeClipBoardText$1
-};
-
-const {
-  closeWidget: closeWidget$1,
-  getChromeVersion: getChromeVersion$1,
-  getElectronVersion: getElectronVersion$1,
-  getNodeVersion: getNodeVersion$1,
-  getV8Version: getV8Version$1,
-  getWindowId: getWindowId$1,
-  openWidget,
-  set,
-  setFocus,
-  showMessageBox: showMessageBox$1,
-  writeClipBoardText
-} = RendererWorker$2;
-
-const RendererWorker = {
-  __proto__: null,
-  closeWidget: closeWidget$1,
-  getChromeVersion: getChromeVersion$1,
-  getElectronVersion: getElectronVersion$1,
-  getNodeVersion: getNodeVersion$1,
-  getV8Version: getV8Version$1,
-  getWindowId: getWindowId$1,
-  openWidget,
-  set,
-  setFocus,
-  showMessageBox: showMessageBox$1,
-  writeClipBoardText
-};
-
-const {
-  closeWidget
-} = RendererWorker;
+const closeWidget = closeWidget$1;
 
 const About$1 = 'About';
 
@@ -1528,24 +1500,16 @@ const getBrowser = () => {
 const version = '0.0.0-dev';
 const commit = 'unknown commit';
 const date = '';
-const {
-  getElectronVersion
-} = RendererWorker;
-const {
-  getNodeVersion
-} = RendererWorker;
-const {
-  getChromeVersion
-} = RendererWorker;
+const getElectronVersion = getElectronVersion$1;
+const getNodeVersion = getNodeVersion$1;
+const getChromeVersion = getChromeVersion$1;
 const getVersion = () => {
   return version;
 };
 const getCommit = () => {
   return commit;
 };
-const {
-  getV8Version
-} = RendererWorker;
+const getV8Version = getV8Version$1;
 const getDate = () => {
   return date;
 };
@@ -1583,14 +1547,14 @@ const loadContent2 = uid => {
   const lines = getDetailStringWeb();
   const {
     oldState
-  } = get$1(uid);
+  } = get(uid);
   const newState = {
     ...oldState,
     productName: productNameLong$1,
     lines,
     focusId: Ok$2
   };
-  set$1(uid, oldState, newState);
+  set(uid, oldState, newState);
 };
 
 const Ok = 'Ok';
@@ -1655,7 +1619,7 @@ const HandleContextMenu = 5;
 const HandleFocusIn = 6;
 
 const br = {
-  type: VirtualDomElements.Br,
+  type: Br,
   childCount: 0
 };
 const renderLine = (line, index) => {
@@ -1667,7 +1631,7 @@ const renderLine = (line, index) => {
 
 const getAboutContentVirtualDom = lines => {
   const dom = [{
-    type: VirtualDomElements.Div,
+    type: Div,
     className: DialogMessage,
     childCount: lines.length * 2 - 1
   }, ...lines.flatMap(renderLine)];
@@ -1681,7 +1645,7 @@ const Dialog = 'dialog';
 
 const getPrimaryButtonVirtualDom = (message, name) => {
   return [{
-    type: VirtualDomElements.Button,
+    type: Button$2,
     className: mergeClassNames(Button$1, ButtonPrimary),
     onClick: HandleClickButton,
     childCount: 1,
@@ -1691,7 +1655,7 @@ const getPrimaryButtonVirtualDom = (message, name) => {
 
 const getSecondaryButtonVirtualDom = (message, name) => {
   return [{
-    type: VirtualDomElements.Button,
+    type: Button$2,
     className: mergeClassNames(Button$1, ButtonSecondary),
     onClick: HandleClickButton,
     childCount: 1,
@@ -1710,7 +1674,7 @@ const Focusable = -1;
 
 const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copyMessage, productName) => {
   const dom = [{
-    type: VirtualDomElements.Div,
+    type: Div,
     className: DialogContent,
     tabIndex: Focusable,
     role: Dialog,
@@ -1719,41 +1683,41 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     onFocusIn: HandleFocusIn,
     childCount: 3
   }, {
-    type: VirtualDomElements.Div,
+    type: Div,
     className: DialogToolBarRow,
     childCount: 1
   }, {
-    type: VirtualDomElements.Div,
+    type: Div,
     className: DialogClose,
     ariaLabel: closeMessage,
     role: Button,
     onClick: HandleClickClose,
     childCount: 1
   }, {
-    type: VirtualDomElements.Div,
+    type: Div,
     className: mergeClassNames(MaskIcon, MaskIconClose),
     childCount: 0
   }, {
-    type: VirtualDomElements.Div,
+    type: Div,
     className: DialogMessageRow,
     childCount: 2
   }, {
-    type: VirtualDomElements.Div,
+    type: Div,
     className: mergeClassNames(DialogIcon$1, DialogInfoIcon, MaskIcon, MaskIconInfo),
     id: DialogIcon,
     ariaLabel: infoMessage,
     childCount: 0
   }, {
-    type: VirtualDomElements.Div,
+    type: Div,
     className: DialogContentRight,
     childCount: 2
   }, {
-    type: VirtualDomElements.Div,
+    type: Div,
     id: DialogHeading,
     className: DialogHeading$1,
     childCount: 1
   }, text(productName), ...content, {
-    type: VirtualDomElements.Div,
+    type: Div,
     className: DialogButtonsRow,
     childCount: 2
   }, ...getSecondaryButtonVirtualDom(okMessage, Ok$1), ...getPrimaryButtonVirtualDom(copyMessage, Copy$1)];
@@ -1763,7 +1727,7 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
 const getAboutVirtualDom = (productName, lines, closeMessage, okMessage, copyMessage, infoMessage) => {
   const content = getAboutContentVirtualDom(lines);
   return [{
-    type: VirtualDomElements.Div,
+    type: Div,
     className: mergeClassNames(Viewlet, About),
     onContextMenu: HandleContextMenu,
     childCount: 1
@@ -1822,8 +1786,8 @@ const doRender = (uid, diffResult) => {
   const {
     oldState,
     newState
-  } = get$1(uid);
-  set$1(uid, newState, newState);
+  } = get(uid);
+  set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -1851,9 +1815,7 @@ const showAboutDefault = async () => {
   await openWidget(About$1);
 };
 
-const {
-  getWindowId
-} = RendererWorker;
+const getWindowId = getWindowId$1;
 
 const productNameLong = 'Lvce Editor - OSS';
 const getProductNameLong = () => {
@@ -1915,7 +1877,7 @@ const showAbout = async platform => {
 };
 
 const commandMap = {
-  'About.create': create$1,
+  'About.create': create,
   'About.diff2': diff2,
   'About.dispose': dispose,
   'About.focusNext': wrapCommand(focusNext),
@@ -1935,10 +1897,11 @@ const commandMap = {
 };
 
 const listen = async () => {
+  registerCommands(commandMap);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set(rpc);
+  set$1(rpc);
 };
 
 const main = async () => {

package/package.json

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