@lvce-editor/about-view 4.17.0 → 5.1.0

package/dist/aboutWorkerMain.js

@@ -414,7 +414,7 @@ const registerPromise = () => {
     promise
   };
 };
-const create$2 = (method, params) => {
+const create$2$1 = (method, params) => {
   const {
     id,
     promise
@@ -706,7 +706,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const {
     message,
     promise
-  } = create$2(method, params);
+  } = create$2$1(method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -790,7 +790,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$1 = async ({
+const create$2 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -802,20 +802,42 @@ const create$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1
+  create: create$2
 };
 
-const states = Object.create(null);
-const get$1 = uid => {
-  return states[uid];
-};
-const set$1 = (uid, oldState, newState) => {
-  states[uid] = {
-    oldState,
-    newState
+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];
+      }
+    }
   };
 };
 
+const {
+  get: get$1,
+  set: set$1,
+  dispose: dispose$1} = create$1();
+
 const create = uid => {
   const state = {
     uid,
@@ -827,20 +849,26 @@ const create = uid => {
 };
 
 const RenderFocus = 2;
+const RenderFocusContext = 4;
 const RenderAbout = 3;
 
-const diffType$1 = RenderAbout;
-const isEqual$1 = (oldState, newState) => {
+const diffType$2 = RenderAbout;
+const isEqual$2 = (oldState, newState) => {
   return oldState.productName === newState.productName && JSON.stringify(oldState.lines) === JSON.stringify(newState.lines);
 };
 
-const diffType = RenderFocus;
+const diffType$1 = RenderFocus;
+const isEqual$1 = (oldState, newState) => {
+  return oldState.focusId === newState.focusId;
+};
+
+const diffType = RenderFocusContext;
 const isEqual = (oldState, newState) => {
   return oldState.focusId === newState.focusId;
 };
 
-const modules = [isEqual$1, isEqual];
-const numbers = [diffType$1, diffType];
+const modules = [isEqual$2, isEqual$1, isEqual];
+const numbers = [diffType$2, diffType$1, diffType];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -862,6 +890,10 @@ const diff2 = uid => {
   return diffResult;
 };
 
+const dispose = uid => {
+  dispose$1(uid);
+};
+
 const None = 0;
 const Ok$2 = 1;
 const Copy$2 = 2;
@@ -908,6 +940,95 @@ const focusPrevious = state => {
   };
 };
 
+const commandIds = ['handleClickClose', 'handleClickOk', 'handleClickCopy', 'handleFocusIn', 'focusNext', 'focusPrevious'];
+const getCommandIds = () => {
+  return commandIds;
+};
+
+const Tab = 2;
+const Escape = 8;
+
+const Shift = 1 << 10 >>> 0;
+
+const FocusAbout = 4;
+
+const getKeyBindings = () => {
+  return [{
+    key: Escape,
+    command: 'About.handleClickClose',
+    when: FocusAbout
+  }, {
+    key: Tab,
+    command: 'About.focusNext',
+    when: FocusAbout
+  }, {
+    key: Tab | Shift,
+    command: 'About.focusPrevious',
+    when: FocusAbout
+  }];
+};
+
+const RendererWorker = 1;
+
+const rpcs = Object.create(null);
+const set = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get = id => {
+  return rpcs[id];
+};
+
+const invoke = (method, ...params) => {
+  const rpc = get(RendererWorker);
+  // @ts-ignore
+  return rpc.invoke(method, ...params);
+};
+
+const handleClickClose = async state => {
+  await invoke('Viewlet.closeWidget', 'About');
+  return state;
+};
+
+const writeText = async text => {
+  await invoke('ClipBoard.writeText', /* text */text);
+};
+
+const NewLine = '\n';
+
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+
+const handleClickCopy = async state => {
+  const {
+    lines
+  } = state;
+  const message = joinLines(lines);
+  await writeText(message);
+  return state;
+};
+
+const closeWidget = async id => {
+  await invoke('Viewlet.closeWidget', id);
+};
+
+const handleClickOk = async state => {
+  await closeWidget('About');
+  return state;
+};
+
+const handleFocusIn = async state => {
+  // TODO remove side effect
+  await invoke('Focus.setFocus', FocusAbout);
+  if (state.focusId) {
+    return state;
+  }
+  return {
+    ...state,
+    focusId: Ok$2
+  };
+};
+
 const OneSecondAgo = '1 second ago';
 const SomeSecondsAgo = '{PH1} seconds ago';
 const OneMinuteAgo = '1 minute ago';
@@ -1192,26 +1313,8 @@ const formatAboutDate = (isoDate, now) => {
   return `${isoDate} (${ago})`;
 };
 
-const NewLine = '\n';
-
-const joinLines = lines => {
-  return lines.join(NewLine);
-};
-
-const RendererWorker = 1;
-
-const rpcs = Object.create(null);
-const set = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const get = id => {
-  return rpcs[id];
-};
-
-const invoke = (method, ...params) => {
-  const rpc = get(RendererWorker);
-  // @ts-ignore
-  return rpc.invoke(method, ...params);
+const getBrowser = () => {
+  return `${navigator.userAgent}`;
 };
 
 const version = '0.0.0-dev';
@@ -1255,18 +1358,6 @@ const Process = {
   version
 };
 
-const getDetailString = async () => {
-  const [electronVersion, nodeVersion, chromeVersion, version, commit, v8Version, date] = await Promise.all([getElectronVersion(), getNodeVersion(), getChromeVersion(), getVersion(), getCommit(), getV8Version(), getDate()]);
-  const now = Date.now();
-  const formattedDate = formatAboutDate(date, now);
-  const lines = [`Version: ${version}`, `Commit: ${commit}`, `Date: ${formattedDate}`, `Electron: ${electronVersion}`, `Chromium: ${chromeVersion}`, `Node: ${nodeVersion}`, `V8: ${v8Version}`];
-  return joinLines(lines);
-};
-
-const getBrowser = () => {
-  return `${navigator.userAgent}`;
-};
-
 const getDetailStringWeb = () => {
   const {
     date,
@@ -1280,6 +1371,57 @@ const getDetailStringWeb = () => {
   return lines;
 };
 
+const loadContent2 = uid => {
+  const lines = getDetailStringWeb();
+  const {
+    oldState
+  } = get$1(uid);
+  const newState = {
+    ...oldState,
+    productName: productNameLong$1,
+    lines,
+    focusId: Ok$2
+  };
+  set$1(uid, oldState, newState);
+};
+
+const Ok$1 = 'Ok';
+const Copy$1 = 'Copy';
+const Info$1 = 'Info';
+const CloseDialog = 'Close Dialog';
+
+const ok = () => {
+  return i18nString(Ok$1);
+};
+const copy = () => {
+  return i18nString(Copy$1);
+};
+const info = () => {
+  return i18nString(Info$1);
+};
+const closeDialog = () => {
+  return i18nString(CloseDialog);
+};
+
+const createViewModel = state => {
+  const okMessage = ok();
+  const copyMessage = copy();
+  const closeMessage = closeDialog();
+  const infoMessage = info();
+  const {
+    productName,
+    lines
+  } = state;
+  return {
+    productName,
+    lines,
+    closeMessage,
+    okMessage,
+    copyMessage,
+    infoMessage
+  };
+};
+
 const Button$2 = 'Button';
 const ButtonPrimary = 'ButtonPrimary';
 const ButtonSecondary = 'ButtonSecondary';
@@ -1307,9 +1449,12 @@ const HandleFocusIn = 'handleFocusIn';
 
 const Button$1 = 1;
 const Div = 4;
-const Text = 12;
 const Br = 55;
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+const Text = 12;
 const text = data => {
   return {
     type: Text,
@@ -1343,14 +1488,6 @@ const True = 'true';
 const Button = 'button';
 const Dialog = 'dialog';
 
-const joinBySpace = (...items) => {
-  return items.join(' ');
-};
-
-const mergeClassNames = (...classNames) => {
-  return joinBySpace(...classNames.filter(Boolean));
-};
-
 const getPrimaryButtonVirtualDom = (message, onClick, name) => {
   return [{
     type: Button$1,
@@ -1374,8 +1511,12 @@ const getSecondaryButtonVirtualDom = (message, onClick, name) => {
 const DialogIcon = 'DialogIcon';
 const DialogHeading = 'DialogHeading';
 
-const Ok$1 = 'Ok';
-const Copy$1 = 'Copy';
+const Ok = 'Ok';
+const Copy = 'Copy';
+
+const joinBySpace = (...items) => {
+  return items.join(' ');
+};
 
 const Focusable = -1;
 
@@ -1427,7 +1568,7 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     type: Div,
     className: DialogButtonsRow,
     childCount: 2
-  }, ...getSecondaryButtonVirtualDom(okMessage, HandleClickOk, Ok$1), ...getPrimaryButtonVirtualDom(copyMessage, HandleClickCopy, Copy$1)];
+  }, ...getSecondaryButtonVirtualDom(okMessage, HandleClickOk, Ok), ...getPrimaryButtonVirtualDom(copyMessage, HandleClickCopy, Copy)];
   return dom;
 };
 
@@ -1441,123 +1582,6 @@ const getAboutVirtualDom = (productName, lines, closeMessage, okMessage, copyMes
   }, ...getDialogVirtualDom(content, closeMessage, infoMessage, okMessage, copyMessage, productName)];
 };
 
-const commandIds = ['handleClickClose', 'handleClickOk', 'handleClickCopy', 'handleFocusIn', 'focusNext', 'focusPrevious'];
-const getCommandIds = () => {
-  return commandIds;
-};
-
-const Tab = 2;
-const Escape = 8;
-
-const Shift = 1 << 10 >>> 0;
-
-const FocusAbout = 4;
-
-const getKeyBindings = () => {
-  return [{
-    key: Escape,
-    command: 'About.handleClickClose',
-    when: FocusAbout
-  }, {
-    key: Tab,
-    command: 'About.focusNext',
-    when: FocusAbout
-  }, {
-    key: Tab | Shift,
-    command: 'About.focusPrevious',
-    when: FocusAbout
-  }];
-};
-
-const handleClickClose = async state => {
-  await invoke('Viewlet.closeWidget', 'About');
-  return state;
-};
-
-const writeText = async text => {
-  await invoke('ClipBoard.writeText', /* text */text);
-};
-
-const handleClickCopy = async state => {
-  const {
-    lines
-  } = state;
-  const message = joinLines(lines);
-  await writeText(message);
-  return state;
-};
-
-const handleClickOk = async state => {
-  await invoke('Viewlet.closeWidget', 'About');
-  return state;
-};
-
-const handleFocusIn = async state => {
-  await invoke('Focus.setFocus', FocusAbout);
-  return state;
-};
-
-const loadContent2 = uid => {
-  const lines = getDetailStringWeb();
-  const {
-    oldState
-  } = get$1(uid);
-  const newState = {
-    ...oldState,
-    productName: productNameLong$1,
-    lines,
-    focusId: Ok$2
-  };
-  set$1(uid, oldState, newState);
-};
-
-const loadContent = state => {
-  const lines = getDetailStringWeb();
-  return {
-    ...state,
-    productName: productNameLong$1,
-    lines,
-    focusId: Ok$2
-  };
-};
-
-const Ok = 'Ok';
-const Copy = 'Copy';
-const Info$1 = 'Info';
-const CloseDialog = 'Close Dialog';
-
-const ok = () => {
-  return i18nString(Ok);
-};
-const copy = () => {
-  return i18nString(Copy);
-};
-const info = () => {
-  return i18nString(Info$1);
-};
-const closeDialog = () => {
-  return i18nString(CloseDialog);
-};
-
-const createViewModel = state => {
-  const okMessage = ok();
-  const copyMessage = copy();
-  const closeMessage = closeDialog();
-  const infoMessage = info();
-  const {
-    productName,
-    lines
-  } = state;
-  return {
-    productName,
-    lines,
-    closeMessage,
-    okMessage,
-    copyMessage,
-    infoMessage
-  };
-};
-
 const renderDialog = (oldState, newState) => {
   const viewModel = createViewModel(newState);
   const dom = getAboutVirtualDom(viewModel.productName, viewModel.lines, viewModel.closeMessage, viewModel.okMessage, viewModel.copyMessage, viewModel.infoMessage);
@@ -1567,9 +1591,9 @@ const renderDialog = (oldState, newState) => {
 const getFocusSelector = focusId => {
   switch (focusId) {
     case Copy$2:
-      return Copy$1;
+      return Copy;
     case Ok$2:
-      return Ok$1;
+      return Ok;
     default:
       return '';
   }
@@ -1580,12 +1604,18 @@ const renderFocus = (oldState, newState) => {
   return ['Viewlet.focusElementByName', name];
 };
 
+const renderFocusContext = (oldState, newState) => {
+  return ['Viewlet.setFocusContext', FocusAbout];
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderAbout:
       return renderDialog;
     case RenderFocus:
       return renderFocus;
+    case RenderFocusContext:
+      return renderFocusContext;
     default:
       throw new Error('unknown renderer');
   }
@@ -1600,21 +1630,16 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
-const doRender$1 = (uid, diffResult) => {
+const doRender = (uid, diffResult) => {
   const {
     oldState,
     newState
   } = get$1(uid);
-  const commands = applyRender(oldState, newState, diffResult);
   set$1(uid, newState, newState);
+  const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 
-const doRender = (oldState, newState) => {
-  const diffResult = diff(oldState, newState);
-  return applyRender(oldState, newState, diffResult);
-};
-
 const renderEventListeners = () => {
   return [{
     name: HandleClickOk,
@@ -1665,6 +1690,14 @@ const showMessageBox = async options => {
 
 const Info = 'info';
 
+const getDetailString = async () => {
+  const [electronVersion, nodeVersion, chromeVersion, version, commit, v8Version, date] = await Promise.all([getElectronVersion(), getNodeVersion(), getChromeVersion(), getVersion(), getCommit(), getV8Version(), getDate()]);
+  const now = Date.now();
+  const formattedDate = formatAboutDate(date, now);
+  const lines = [`Version: ${version}`, `Commit: ${commit}`, `Date: ${formattedDate}`, `Electron: ${electronVersion}`, `Chromium: ${chromeVersion}`, `Node: ${nodeVersion}`, `V8: ${v8Version}`];
+  return joinLines(lines);
+};
+
 const showAboutElectron = async () => {
   const windowId = await getWindowId();
   const detail = await getDetailString();
@@ -1698,29 +1731,37 @@ const showAbout = async platform => {
   await fn();
 };
 
+const wrapCommand = fn => {
+  const wrapped = async (uid, ...args) => {
+    const {
+      newState
+    } = get$1(uid);
+    const newerState = await fn(newState, ...args);
+    if (newState === newerState) {
+      return;
+    }
+    set$1(uid, newState, newerState);
+  };
+  return wrapped;
+};
+
 const commandMap = {
   'About.create': create,
   'About.diff2': diff2,
-  'About.focusNext': focusNext,
-  'About.focusPrevious': focusPrevious,
+  'About.dispose': dispose,
+  'About.focusNext': wrapCommand(focusNext),
+  'About.focusPrevious': wrapCommand(focusPrevious),
   'About.getCommandIds': getCommandIds,
   'About.getKeyBindings': getKeyBindings,
-  'About.handleClickClose': handleClickClose,
-  'About.handleClickCopy': handleClickCopy,
+  'About.handleClickClose': wrapCommand(handleClickClose),
+  'About.handleClickCopy': wrapCommand(handleClickCopy),
+  'About.handleClickOk': wrapCommand(handleClickOk),
+  'About.handleFocusIn': wrapCommand(handleFocusIn),
   'About.loadContent2': loadContent2,
-  'About.handleClickOk': handleClickOk,
-  'About.handleFocusIn': handleFocusIn,
-  'About.render2': doRender$1,
+  'About.render2': doRender,
   'About.renderEventListeners': renderEventListeners,
   'About.showAbout': showAbout,
-  'About.showAboutElectron': showAboutElectron,
-  // deprecated
-  'About.loadContent': loadContent,
-  'About.diff': diff,
-  'About.render': doRender,
-  'About.getVirtualDom': getAboutVirtualDom,
-  'About.getDetailString': getDetailString,
-  'About.getDetailStringWeb': getDetailStringWeb
+  'About.showAboutElectron': showAboutElectron
 };
 
 const listen = async () => {

package/package.json

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