@lvce-editor/about-view 7.6.0 → 7.8.0

package/dist/aboutWorkerMain.js

@@ -5,6 +5,18 @@ const toCommandId = key => {
 const create$a = () => {
   const states = Object.create(null);
   const commandMapRef = {};
+  const updateState = (uid, updater) => {
+    const current = states[uid];
+    const updatedState = updater(current.newState);
+    if (updatedState !== current.newState) {
+      states[uid] = {
+        newState: updatedState,
+        oldState: current.oldState,
+        scheduledState: updatedState
+      };
+    }
+    return Promise.resolve(updatedState);
+  };
   return {
     clear() {
       for (const key of Object.keys(states)) {
@@ -49,6 +61,16 @@ const create$a = () => {
         scheduledState: scheduledState ?? newState
       };
     },
+    wrapAsyncCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const context = {
+          getState: () => states[uid].newState,
+          updateState: updater => updateState(uid, updater)
+        };
+        await fn(context, ...args);
+      };
+      return wrapped;
+    },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
@@ -122,16 +144,16 @@ const {
   getCommandIds,
   registerCommands,
   set: set$3,
+  wrapAsyncCommand,
   wrapCommand
 } = create$a();
 
-const create$9 = (uid, useNewLoadConfig = false) => {
+const create$9 = uid => {
   const state = {
     focusId: 0,
     lines: [],
     productName: '',
-    uid,
-    useNewLoadConfig
+    uid
   };
   set$3(uid, state, state);
 };
@@ -228,10 +250,174 @@ const focusPrevious = state => {
   };
 };
 
+const Audio = 0;
 const Button$2 = 1;
+const Col = 2;
+const ColGroup = 3;
 const Div = 4;
+const H1 = 5;
+const Input = 6;
+const Kbd = 7;
+const Span = 8;
+const Table = 9;
+const TBody = 10;
+const Td = 11;
 const Text = 12;
+const Th = 13;
+const THead = 14;
+const Tr = 15;
+const I = 16;
+const Img = 17;
+const Root = 0;
+const Ins = 20;
+const Del = 21;
+const H2 = 22;
+const H3 = 23;
+const H4 = 24;
+const H5 = 25;
+const H6 = 26;
+const Article = 27;
+const Aside = 28;
+const Footer = 29;
+const Header = 30;
+const Nav = 40;
+const Section = 41;
+const Search = 42;
+const Dd = 43;
+const Dl = 44;
+const Figcaption = 45;
+const Figure = 46;
+const Hr = 47;
+const Li = 48;
+const Ol = 49;
+const P = 50;
+const Pre = 51;
+const A = 53;
+const Abbr = 54;
 const Br = 55;
+const Cite = 56;
+const Data = 57;
+const Time = 58;
+const Tfoot = 59;
+const Ul = 60;
+const Video = 61;
+const TextArea = 62;
+const Select = 63;
+const Option = 64;
+const Code = 65;
+const Label = 66;
+const Dt = 67;
+const Iframe = 68;
+const Main = 69;
+const Strong = 70;
+const Em = 71;
+const Style = 72;
+const Html = 73;
+const Head = 74;
+const Title = 75;
+const Meta = 76;
+const Canvas = 77;
+const Form = 78;
+const BlockQuote = 79;
+const Quote = 80;
+const Circle = 81;
+const Defs = 82;
+const Ellipse = 83;
+const G = 84;
+const Line = 85;
+const Path = 86;
+const Polygon = 87;
+const Polyline = 88;
+const Rect = 89;
+const Svg = 90;
+const Use = 91;
+const Reference = 100;
+
+const VirtualDomElements = {
+  __proto__: null,
+  A,
+  Abbr,
+  Article,
+  Aside,
+  Audio,
+  BlockQuote,
+  Br,
+  Button: Button$2,
+  Canvas,
+  Circle,
+  Cite,
+  Code,
+  Col,
+  ColGroup,
+  Data,
+  Dd,
+  Defs,
+  Del,
+  Div,
+  Dl,
+  Dt,
+  Ellipse,
+  Em,
+  Figcaption,
+  Figure,
+  Footer,
+  Form,
+  G,
+  H1,
+  H2,
+  H3,
+  H4,
+  H5,
+  H6,
+  Head,
+  Header,
+  Hr,
+  Html,
+  I,
+  Iframe,
+  Img,
+  Input,
+  Ins,
+  Kbd,
+  Label,
+  Li,
+  Line,
+  Main,
+  Meta,
+  Nav,
+  Ol,
+  Option,
+  P,
+  Path,
+  Polygon,
+  Polyline,
+  Pre,
+  Quote,
+  Rect,
+  Reference,
+  Root,
+  Search,
+  Section,
+  Select,
+  Span,
+  Strong,
+  Style,
+  Svg,
+  TBody,
+  THead,
+  Table,
+  Td,
+  Text,
+  TextArea,
+  Tfoot,
+  Th,
+  Time,
+  Title,
+  Tr,
+  Ul,
+  Use,
+  Video
+};
 
 const TargetName = 'event.target.name';
 
@@ -255,6 +441,8 @@ const text = data => {
   };
 };
 
+new Set(Object.values(VirtualDomElements));
+
 const FocusAbout = 4;
 
 const getKeyBindings = () => {
@@ -371,7 +559,6 @@ const walkValue = (value, transferrables, isTransferrable) => {
     for (const property of Object.values(value)) {
       walkValue(property, transferrables, isTransferrable);
     }
-    return;
   }
 };
 const getTransferrables = value => {
@@ -525,7 +712,14 @@ class IpcError extends VError {
       const cause = new Error(message);
       // @ts-ignore
       cause.code = code;
-      cause.stack = stack;
+      if (stack) {
+        Object.defineProperty(cause, 'stack', {
+          configurable: true,
+          enumerable: false,
+          value: stack,
+          writable: true
+        });
+      }
       super(cause, betterMessage);
     } else {
       super(betterMessage);
@@ -829,8 +1023,10 @@ const getCurrentStack = () => {
   const currentStack = joinLines$1(splitLines(new Error().stack || '').slice(stackLinesToSkip));
   return currentStack;
 };
-const getNewLineIndex = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$1, startIndex);
+const getNewLineIndex = (string, startIndex) => {
+  {
+    return string.indexOf(NewLine$1);
+  }
 };
 const getParentStack = error => {
   let parentStack = error.stack || error.data || error.message || '';
@@ -841,55 +1037,77 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const restoreExistingError = (error, currentStack) => {
+  if (typeof error.stack === 'string') {
+    error.stack = error.stack + NewLine$1 + currentStack;
+  }
+  return error;
+};
+const restoreMethodNotFoundError = (error, currentStack) => {
+  const restoredError = new JsonRpcError(error.message);
+  const parentStack = getParentStack(error);
+  restoredError.stack = parentStack + NewLine$1 + currentStack;
+  return restoredError;
+};
+const restoreStackFromData = (restoredError, error, currentStack) => {
+  if (error.data.stack && error.data.type && error.message) {
+    restoredError.stack = error.data.type + ': ' + error.message + NewLine$1 + error.data.stack + NewLine$1 + currentStack;
+    return;
+  }
+  if (error.data.stack) {
+    restoredError.stack = error.data.stack;
+  }
+};
+const applyDataProperties = (restoredError, error) => {
+  if (!error.data) {
+    return;
+  }
+  restoreStackFromData(restoredError, error, getCurrentStack());
+  if (error.data.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.data.codeFrame;
+  }
+  if (error.data.code) {
+    // @ts-ignore
+    restoredError.code = error.data.code;
+  }
+  if (error.data.type) {
+    // @ts-ignore
+    restoredError.name = error.data.type;
+  }
+};
+const applyDirectProperties = (restoredError, error) => {
+  if (error.stack) {
+    const lowerStack = restoredError.stack || '';
+    const indexNewLine = getNewLineIndex(lowerStack);
+    const parentStack = getParentStack(error);
+    // @ts-ignore
+    restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+  }
+  if (error.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.codeFrame;
+  }
+};
+const restoreMessageError = (error, _currentStack) => {
+  const restoredError = constructError(error.message, error.type, error.name);
+  if (error.data) {
+    applyDataProperties(restoredError, error);
+  } else {
+    applyDirectProperties(restoredError, error);
+  }
+  return restoredError;
+};
 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;
+    return restoreExistingError(error, currentStack);
   }
   if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine$1 + currentStack;
-    return restoredError;
+    return restoreMethodNotFoundError(error, currentStack);
   }
   if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine$1 + error.data.stack + NewLine$1 + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
-    }
-    return restoredError;
+    return restoreMessageError(error);
   }
   if (typeof error === 'string') {
     return new Error(`JsonRpc Error: ${error}`);
@@ -1456,22 +1674,20 @@ const handleClickButton = async (state, name) => {
   }
 };
 
-const handleFocusIn = async state => {
+const handleFocusIn = async context => {
   // TODO remove side effect
   await setFocus(FocusAbout);
-  if (state.focusId) {
-    return state;
-  }
-  return {
-    ...state,
-    focusId: Ok$2
-  };
+  await context.updateState(state => {
+    if (state.focusId) {
+      return state;
+    }
+    return {
+      ...state,
+      focusId: Ok$2
+    };
+  });
 };
 
-const commit = 'unknown commit';
-
-const commitDate = '';
-
 const OneSecondAgo = '1 second ago';
 const SomeSecondsAgo = '{PH1} seconds ago';
 const OneMinuteAgo = '1 minute ago';
@@ -1502,15 +1718,15 @@ const InOneYear = 'in 1 year';
 const InSomeYears = 'in {PH1} years';
 
 const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
   if (placeholders === emptyObject) {
     return key;
   }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
+  let result = key;
+  for (const [placeholder, replacement] of Object.entries(placeholders)) {
+    result = result.split(`{${placeholder}}`).join(String(replacement));
+  }
+  return result;
 };
 
 // based on https://github.com/microsoft/vscode/blob/bd782eb059e133d3a20fdb446b8feb0010a278ad/src/vs/base/common/date.ts (License MIT)
@@ -1759,13 +1975,11 @@ const getBrowser = () => {
   return navigator.userAgent;
 };
 
-const version = '0.0.0-dev';
-
-const getDetailStringWeb = () => {
+const getDetailStringWeb = config => {
   const now = Date.now();
-  const formattedDate = formatAboutDate(commitDate, now);
+  const formattedDate = formatAboutDate(config.date, now);
   const browser = getBrowser();
-  const lines = [`Version: ${version}`, `Commit: ${commit}`, `Date: ${formattedDate}`, `Browser: ${browser}`];
+  const lines = [`Version: ${config.version}`, `Commit: ${config.commit}`, `Date: ${formattedDate}`, `Browser: ${browser}`];
   return lines;
 };
 
@@ -1780,7 +1994,7 @@ const getString = (config, key) => {
   }
   return value;
 };
-const loadConfig = async _state => {
+const loadConfig = async () => {
   const configJsonPath = await getConfigJsonPath();
   // FileSystemWorker.readFile is a custom RPC that already returns a string.
   // eslint-disable-next-line unicorn/consistent-json-file-read
@@ -1794,37 +2008,14 @@ const loadConfig = async _state => {
   };
 };
 
-const getContentFromConfig = async state => {
-  const now = Date.now();
-  try {
-    const config = await loadConfig(state);
-    const resolvedVersion = config.version || version;
-    const resolvedCommit = config.commit || commit;
-    const resolvedDate = config.date || commitDate;
-    const formattedDate = formatAboutDate(resolvedDate, now);
-    const browser = getBrowser();
-    return {
-      lines: [`Version: ${resolvedVersion}`, `Commit: ${resolvedCommit}`, `Date: ${formattedDate}`, `Browser: ${browser}`],
-      productName: config.productName || state.productName
-    };
-  } catch {
-    return {
-      lines: getDetailStringWeb(),
-      productName: state.productName
-    };
-  }
-};
-const loadContent2 = async state => {
-  const content = state.useNewLoadConfig ? await getContentFromConfig(state) : {
-    lines: getDetailStringWeb(),
-    productName: state.productName
-  };
-  return {
+const loadContent2 = async context => {
+  const config = await loadConfig();
+  await context.updateState(state => ({
     ...state,
     focusId: Ok$2,
-    lines: content.lines,
-    productName: content.productName
-  };
+    lines: getDetailStringWeb(config),
+    productName: config.productName
+  }));
 };
 
 const Ok = 'Ok';
@@ -2005,8 +2196,15 @@ const getAboutVirtualDom = (productName, lines, closeMessage, okMessage, copyMes
 };
 
 const renderDialog = (oldState, newState) => {
-  const viewModel = createViewModel(newState);
-  const dom = getAboutVirtualDom(viewModel.productName, viewModel.lines, viewModel.closeMessage, viewModel.okMessage, viewModel.copyMessage, viewModel.infoMessage);
+  const {
+    closeMessage,
+    copyMessage,
+    infoMessage,
+    lines,
+    okMessage,
+    productName
+  } = createViewModel(newState);
+  const dom = getAboutVirtualDom(productName, lines, closeMessage, okMessage, copyMessage, infoMessage);
   return ['Viewlet.setDom2', dom];
 };
 
@@ -2101,34 +2299,22 @@ const Info = 'info';
 const getElectronVersion = getElectronVersion$1;
 const getNodeVersion = getNodeVersion$1;
 const getChromeVersion = getChromeVersion$1;
-const getVersion = async () => {
-  return version;
-};
-const getCommit = async () => {
-  return commit;
-};
 const getV8Version = getV8Version$1;
-const getDate = () => {
-  return commitDate;
-};
 
-/* eslint-disable @typescript-eslint/await-thenable */
-const getDetailString = async () => {
-  const [electronVersion, nodeVersion, chromeVersion, version, commit, v8Version, date] = await Promise.all([getElectronVersion(), getNodeVersion(), getChromeVersion(), getVersion(), getCommit(), getV8Version(), getDate()]);
+const getDetailString = async config => {
+  const [electronVersion, nodeVersion, chromeVersion, v8Version] = await Promise.all([getElectronVersion(), getNodeVersion(), getChromeVersion(), getV8Version()]);
   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}`];
+  const formattedDate = formatAboutDate(config.date, now);
+  const lines = [`Version: ${config.version}`, `Commit: ${config.commit}`, `Date: ${formattedDate}`, `Electron: ${electronVersion}`, `Chromium: ${chromeVersion}`, `Node: ${nodeVersion}`, `V8: ${v8Version}`];
   return joinLines(lines);
 };
 
-const getProductName = async () => {
-  const config = await loadConfig();
-  return config.productName;
-};
 const showAboutElectron = async () => {
-  const windowId = await getWindowId();
-  const detail = await getDetailString();
-  const productName = await getProductName();
+  const [windowId, config] = await Promise.all([getWindowId(), loadConfig()]);
+  const detail = await getDetailString(config);
+  const {
+    productName
+  } = config;
   const options = {
     buttons: [copy(), ok()],
     detail,
@@ -2171,8 +2357,8 @@ const commandMap = {
   'About.handleClickClose': wrapCommand(handleClickClose),
   'About.handleClickCopy': wrapCommand(handleClickCopy),
   'About.handleClickOk': wrapCommand(handleClickOk),
-  'About.handleFocusIn': wrapCommand(handleFocusIn),
-  'About.loadContent2': wrapCommand(loadContent2),
+  'About.handleFocusIn': wrapAsyncCommand(handleFocusIn),
+  'About.loadContent2': wrapAsyncCommand(loadContent2),
   'About.render2': doRender,
   'About.renderEventListeners': renderEventListeners,
   'About.showAbout': showAbout,

package/package.json

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