@lvce-editor/find-widget-worker 3.16.2 → 3.18.0

package/dist/findWidgetWorkerMain.js

@@ -508,6 +508,9 @@ const restoreExistingError = (error, currentStack) => {
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
+  Object.assign(restoredError, {
+    code: error.code
+  });
   const parentStack = getParentStack(error);
   setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
   return restoredError;
@@ -527,9 +530,13 @@ const applyDataProperties = (restoredError, error) => {
     // @ts-ignore
     restoredError.codeFrame = error.data.codeFrame;
   }
-  if (error.data.code) {
+  if (typeof error.data.code === 'string' || typeof error.data.code === 'number') {
     // @ts-ignore
-    restoredError.code = error.data.code;
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.data.code,
+      writable: true
+    });
   }
   if (error.data.type) {
     // @ts-ignore
@@ -550,7 +557,14 @@ const applyDirectProperties = (restoredError, error) => {
   }
 };
 const restoreMessageError = (error, _currentStack) => {
-  const restoredError = constructError(error.message, error.type, error.name);
+  const restoredError = constructError(error.message, error.type || error.data?.type, error.name);
+  if (typeof error.code === 'string' || typeof error.code === 'number') {
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.code,
+      writable: true
+    });
+  }
   if (error.data) {
     applyDataProperties(restoredError, error);
   } else {
@@ -558,6 +572,23 @@ const restoreMessageError = (error, _currentStack) => {
   }
   return restoredError;
 };
+const getFallbackMessage = error => {
+  if (error && typeof error.message === 'string' && error.message) {
+    return error.message;
+  }
+  if (error && error.data) {
+    return getFallbackMessage(error.data);
+  }
+  const stringified = String(error);
+  if (stringified !== '[object Object]') {
+    return stringified;
+  }
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return stringified;
+  }
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
@@ -566,13 +597,13 @@ const restoreJsonRpcError = error => {
   if (error && error.code && error.code === MethodNotFound) {
     return restoreMethodNotFoundError(error, currentStack);
   }
+  if (error && error.error) {
+    return restoreJsonRpcError(error.error);
+  }
   if (error && error.message) {
     return restoreMessageError(error);
   }
-  if (typeof error === 'string') {
-    return new Error(`JsonRpc Error: ${error}`);
-  }
-  return new Error(`JsonRpc Error: ${error}`);
+  return new Error(`JsonRpc Error: ${getFallbackMessage(error)}`);
 };
 const unwrapJsonRpcResult = responseMessage => {
   if ('error' in responseMessage) {
@@ -629,9 +660,9 @@ const getErrorProperty = (error, prettyError) => {
   return {
     code: Custom,
     data: {
-      code: prettyError.code,
+      code: prettyError.code ?? error?.code,
       codeFrame: prettyError.codeFrame,
-      name: prettyError.name,
+      name: prettyError.name ?? error?.name,
       stack: getStack(prettyError),
       type: getErrorType(prettyError)
     },
@@ -666,7 +697,12 @@ const getErrorResponseSimple = (id, error) => {
   return {
     error: {
       code: Custom,
-      data: error,
+      data: error instanceof Error ? {
+        ...error,
+        code: 'code' in error ? error.code : undefined,
+        stack: error.stack,
+        type: error.name
+      } : error,
       // @ts-ignore
       message: error.message
     },
@@ -955,174 +991,10 @@ const CheckBox = 'checkbox';
 const Group = 'group';
 const None = 'none';
 
-const Audio = 0;
 const Button = 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,
-  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 ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
@@ -1192,7 +1064,8 @@ const create$1 = () => {
   const commandQueues = new Map();
   const generations = Object.create(null);
   const states = Object.create(null);
-  const commandMapRef = {};
+  const commandMapRef = Object.create(null);
+  const commandsById = Object.create(null);
   const getGeneration = uid => generations[uid] || 0;
   const isCurrentGeneration = (uid, generation) => {
     return states[uid] !== undefined && getGeneration(uid) === generation;
@@ -1254,6 +1127,18 @@ const create$1 = () => {
         delete states[key];
       }
     },
+    createDirectEventCommandMap(requestRender) {
+      return {
+        async 'Viewlet.executeViewletCommand'(uid, command, ...args) {
+          const fn = commandsById[command];
+          if (!fn) {
+            throw new Error(`Viewlet command not found: ${command}`);
+          }
+          await fn(uid, ...args);
+          await requestRender(uid);
+        }
+      };
+    },
     diff(uid, modules, numbers) {
       const {
         oldState,
@@ -1285,6 +1170,9 @@ const create$1 = () => {
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
+      for (const [key, fn] of Object.entries(commandMap)) {
+        commandsById[toCommandId(key)] = fn;
+      }
     },
     set(uid, oldState, newState, scheduledState) {
       const current = states[uid];
@@ -1529,6 +1417,7 @@ const createState = (uid, x, y, width, height, parentUid, instanceId) => {
     focused: false,
     focusSource: Unknown,
     focusVersion: 0,
+    fontSize: 'inherit',
     height: 0,
     history: [],
     inputBorderWidth: 1,
@@ -1580,7 +1469,7 @@ const isEqual$8 = (oldState, newState) => {
 };
 
 const isEqual$7 = (oldState, newState) => {
-  return oldState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x && oldState.searchInputHeight === newState.searchInputHeight;
+  return oldState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x && oldState.searchInputHeight === newState.searchInputHeight && oldState.fontSize === newState.fontSize;
 };
 
 const isEqual$6 = (oldState, newState) => {
@@ -1815,6 +1704,14 @@ const buildRegex = (searchString, options) => {
   }
 };
 
+// eslint-disable-next-line @typescript-eslint/prefer-readonly-parameter-types -- Appends matches to the shared output array.
+const collectMatchesForLineInternal = (matches, line, lineIndex, regex) => {
+  let lastMatch = regex.exec(line);
+  while (lastMatch) {
+    matches.push(lineIndex, lastMatch.index, lastMatch[0].length);
+    lastMatch = regex.exec(line);
+  }
+};
 const findRegexMatches = (lines, regex) => {
   if (!regex.global) {
     throw new Error('regex must be global');
@@ -1823,15 +1720,8 @@ const findRegexMatches = (lines, regex) => {
     length
   } = lines;
   const matches = [];
-  const collectMatchesForLine = (line, lineIndex) => {
-    let lastMatch = regex.exec(line);
-    while (lastMatch) {
-      matches.push(lineIndex, lastMatch.index, lastMatch[0].length);
-      lastMatch = regex.exec(line);
-    }
-  };
   for (let i = 0; i < length; i++) {
-    collectMatchesForLine(lines[i], i);
+    collectMatchesForLineInternal(matches, lines[i], i, regex);
   }
   return new Uint32Array(matches);
 };
@@ -1875,8 +1765,9 @@ const measureTextHeight = (value, lineHeight) => {
   return lines.length * lineHeight;
 };
 
-const measureInputHeight = (value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded) => {
-  const textHeight = measureTextHeight(value, inputLineHeight);
+const measureInputHeight = (value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize = 'inherit') => {
+  const effectiveLineHeight = typeof fontSize === 'number' ? Math.max(inputLineHeight, fontSize) : inputLineHeight;
+  const textHeight = measureTextHeight(value, effectiveLineHeight);
   const inputHeight = textHeight + inputPaddingBottom + inputPaddingTop + inputBorderWidth * 2;
   const replaceInputHeight = replaceExpanded ? inputHeight : 0; // TODO should be independent of input
   const actualGap = replaceExpanded ? inputGap : 0;
@@ -1891,6 +1782,7 @@ const measureInputHeight = (value, inputLineHeight, inputPaddingBottom, inputPad
 
 const refresh$1 = (state, value, inputSource) => {
   const {
+    fontSize,
     inputBorderWidth,
     inputGap,
     inputLineHeight,
@@ -1914,7 +1806,7 @@ const refresh$1 = (state, value, inputSource) => {
   const {
     height,
     inputHeight
-  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded);
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize);
   if (error) {
     return {
       ...state,
@@ -1971,11 +1863,11 @@ const togglePreserveCase = state => {
   const {
     preserveCase
   } = state;
-  // TODO update search results
-  return {
+  const newState = {
     ...state,
     preserveCase: !preserveCase
   };
+  return refresh(newState, newState.value, User$1);
 };
 
 const toggleUseRegularExpression = state => {
@@ -2376,6 +2268,7 @@ const handleToggleReplaceFocus = state => {
 
 const toggleReplace$1 = state => {
   const {
+    fontSize,
     inputBorderWidth,
     inputGap,
     inputLineHeight,
@@ -2387,7 +2280,7 @@ const toggleReplace$1 = state => {
   const newExpanded = !replaceExpanded;
   const {
     height
-  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, newExpanded);
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, newExpanded, fontSize);
   return {
     ...state,
     height,
@@ -2598,6 +2491,57 @@ const handleReplaceInput = (state, value, inputSource = User$1) => {
   };
 };
 
+const MIN_FONT_SIZE = 10;
+const MAX_FONT_SIZE = 100;
+const EMPTY_VALUES = [undefined, null, '', 0];
+const normalizeFontSize = value => {
+  let result = 'inherit';
+  if (!EMPTY_VALUES.includes(value)) {
+    let numericValue = NaN;
+    if (typeof value === 'number') {
+      numericValue = value;
+    } else if (typeof value === 'string' && value.trim()) {
+      numericValue = Number(value);
+    }
+    if (Number.isFinite(numericValue)) {
+      result = Math.min(MAX_FONT_SIZE, Math.max(MIN_FONT_SIZE, numericValue));
+    }
+  }
+  return result;
+};
+
+const getFontSize = async () => {
+  try {
+    const value = await invoke('Editor.getFindWidgetFontSize');
+    return normalizeFontSize(value);
+  } catch {
+    return 'inherit';
+  }
+};
+
+const handleSettingsChanged = async state => {
+  const {
+    inputBorderWidth,
+    inputGap,
+    inputLineHeight,
+    inputPaddingBottom,
+    inputPaddingTop,
+    replaceExpanded,
+    value
+  } = state;
+  const fontSize = await getFontSize();
+  const {
+    height,
+    inputHeight
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize);
+  return {
+    ...state,
+    fontSize,
+    height,
+    searchInputHeight: inputHeight
+  };
+};
+
 const regexFlags = 'gi';
 const getSearchRegex = searchString => {
   const escaped = escapeRegExpCharacters(searchString);
@@ -2677,6 +2621,7 @@ const loadContent = async (state, savedState) => {
     inputPaddingTop,
     replaceExpanded
   } = state;
+  const fontSize = await getFontSize();
   const {
     replacement,
     value
@@ -2697,11 +2642,12 @@ const loadContent = async (state, savedState) => {
   const {
     height,
     inputHeight
-  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded);
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize);
   return {
     ...state,
     focus: FocusSearchInput,
     focused: true,
+    fontSize,
     height,
     inputSource: Script$1,
     lines,
@@ -2924,8 +2870,6 @@ const text = data => {
   };
 };
 
-new Set(Object.values(VirtualDomElements));
-
 const FindWidget = 'FindWidget';
 const FindWidgetFind = 'FindWidgetFind';
 const FindWidgetMatchCount = 'FindWidgetMatchCount';
@@ -3192,6 +3136,7 @@ const renderContent = (oldState, newState) => {
 
 const renderCss = (oldState, newState) => {
   const {
+    fontSize,
     height,
     searchInputHeight: inputHeight,
     uid,
@@ -3199,12 +3144,14 @@ const renderCss = (oldState, newState) => {
     x,
     y
   } = newState;
+  const cssFontSize = fontSize === 'inherit' ? 'inherit' : `${fontSize}px`;
   const css = `:root {
   --FindWidgetWidth: ${width}px;
   --FindWidgetHeight: ${height}px;
   --FindWidgetX: ${x}px;
   --FindWidgetY: ${y}px;
   --FindWidgetInputHeight: ${inputHeight}px;
+  --FindWidgetFontSize: ${cssFontSize};
 }`;
   return [SetCss, uid, css];
 };
@@ -3500,6 +3447,7 @@ const commandMap = {
   'FindWidget.handleResizerPointerDown': wrapCommand(handleResizerPointerDown),
   'FindWidget.handleResizerPointerMove': wrapCommand(handleResizerPointerMove),
   'FindWidget.handleResizerPointerUp': wrapCommand(handleResizerPointerUp),
+  'FindWidget.handleSettingsChanged': wrapCommand(handleSettingsChanged),
   'FindWidget.handleToggleReplaceFocus': wrapCommand(handleToggleReplaceFocus),
   'FindWidget.loadContent': wrapCommand(loadContent),
   'FindWidget.loadContentInstance': wrapInstanceCommand(loadContent),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/find-widget-worker",
-  "version": "3.16.2",
+  "version": "3.18.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",