@lvce-editor/about-view 4.16.0 → 5.0.0

package/dist/aboutWorkerMain.js

@@ -389,13 +389,13 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$1 = (id, fn) => {
+const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get$1 = id => {
+const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
 let id = 0;
@@ -408,7 +408,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$1(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
@@ -565,14 +565,14 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$1(id);
+  const fn = get$2(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -604,7 +604,7 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1 = (message, error) => {
+const create$1$1 = (message, error) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -615,7 +615,7 @@ const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1(message, errorProperty);
+  return create$1$1(message, errorProperty);
 };
 const create$5 = (message, result) => {
   return {
@@ -790,7 +790,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create = async ({
+const create$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -802,7 +802,31 @@ const create = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create
+  create: create$1
+};
+
+const states = Object.create(null);
+const get$1 = uid => {
+  return states[uid];
+};
+const remove = uid => {
+  delete states[uid];
+};
+const set$1 = (uid, oldState, newState) => {
+  states[uid] = {
+    oldState,
+    newState
+  };
+};
+
+const create = uid => {
+  const state = {
+    uid,
+    focusId: 0,
+    lines: [],
+    productName: ''
+  };
+  set$1(uid, state, state);
 };
 
 const RenderFocus = 2;
@@ -832,6 +856,19 @@ const diff = (oldState, newState) => {
   return diffResult;
 };
 
+const diff2 = uid => {
+  const {
+    oldState,
+    newState
+  } = get$1(uid);
+  const diffResult = diff(oldState, newState);
+  return diffResult;
+};
+
+const dispose = uid => {
+  remove(uid);
+};
+
 const None = 0;
 const Ok$2 = 1;
 const Copy$2 = 2;
@@ -878,6 +915,84 @@ 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 handleClickOk = async state => {
+  await invoke('Viewlet.closeWidget', 'About');
+  return state;
+};
+
+const handleFocusIn = async state => {
+  await invoke('Focus.setFocus', FocusAbout);
+  return state;
+};
+
 const OneSecondAgo = '1 second ago';
 const SomeSecondsAgo = '{PH1} seconds ago';
 const OneMinuteAgo = '1 minute ago';
@@ -1162,26 +1277,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';
@@ -1225,18 +1322,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,
@@ -1250,6 +1335,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';
@@ -1344,8 +1480,8 @@ 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 Focusable = -1;
 
@@ -1397,7 +1533,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;
 };
 
@@ -1411,109 +1547,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 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);
@@ -1523,9 +1556,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 '';
   }
@@ -1556,9 +1589,14 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
-const doRender = (oldState, newState) => {
-  const diffResult = diff(oldState, newState);
-  return applyRender(oldState, newState, diffResult);
+const doRender = (uid, diffResult) => {
+  const {
+    oldState,
+    newState
+  } = get$1(uid);
+  const commands = applyRender(oldState, newState, diffResult);
+  set$1(uid, newState, newState);
+  return commands;
 };
 
 const renderEventListeners = () => {
@@ -1611,6 +1649,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();
@@ -1645,20 +1691,19 @@ const showAbout = async platform => {
 };
 
 const commandMap = {
-  'About.diff': diff,
+  'About.create': create,
+  'About.diff2': diff2,
+  'About.dispose': dispose,
   'About.focusNext': focusNext,
   'About.focusPrevious': focusPrevious,
   'About.getCommandIds': getCommandIds,
-  'About.getDetailString': getDetailString,
-  'About.getDetailStringWeb': getDetailStringWeb,
   'About.getKeyBindings': getKeyBindings,
-  'About.getVirtualDom': getAboutVirtualDom,
   'About.handleClickClose': handleClickClose,
   'About.handleClickCopy': handleClickCopy,
   'About.handleClickOk': handleClickOk,
   'About.handleFocusIn': handleFocusIn,
-  'About.loadContent': loadContent,
-  'About.render': doRender,
+  'About.loadContent2': loadContent2,
+  'About.render2': doRender,
   'About.renderEventListeners': renderEventListeners,
   'About.showAbout': showAbout,
   'About.showAboutElectron': showAboutElectron

package/package.json

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