@lvce-editor/find-widget-worker 3.5.0 → 3.6.0

package/dist/findWidgetWorkerMain.js

@@ -1127,7 +1127,7 @@ const isEqual$8 = (oldState, newState) => {
 };
 
 const isEqual$7 = (oldState, newState) => {
-  return newState.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;
 };
 
 const isEqual$6 = (oldState, newState) => {
@@ -1309,8 +1309,8 @@ const buildRegex = (searchString, options) => {
     };
   } catch (error) {
     return {
-      error: `${error}`,
-      regex: new RegExp('')
+      error: String(error),
+      regex: /.^/
     };
   }
 };
@@ -1323,16 +1323,15 @@ const findRegexMatches = (lines, regex) => {
     length
   } = lines;
   const matches = [];
-  for (let i = 0; i < length; i++) {
-    const line = lines[i];
-    let lastMatch;
-    do {
+  const collectMatchesForLine = (line, lineIndex) => {
+    let lastMatch = regex.exec(line);
+    while (lastMatch) {
+      matches.push(lineIndex, lastMatch.index, lastMatch[0].length);
       lastMatch = regex.exec(line);
-      if (!lastMatch) {
-        break;
-      }
-      matches.push(i, lastMatch.index, lastMatch[0].length);
-    } while (true);
+    }
+  };
+  for (let i = 0; i < length; i++) {
+    collectMatchesForLine(lines[i], i);
   }
   return new Uint32Array(matches);
 };
@@ -1520,20 +1519,22 @@ const applyRegexReplacement = (originalText, regex, replacement) => {
   let result = replacement;
 
   // Handle $& (entire match)
-  result = result.replaceAll('$&', match[0]);
+  result = result.replaceAll('$&', () => {
+    return match[0];
+  });
 
   // Handle $` (text before match) - in this context it's empty since we're matching the whole text
-  result = result.replaceAll('$`', '');
+  result = result.replaceAll('$`', () => '');
 
   // Handle $' (text after match) - in this context it's empty since we're matching the whole text
-  result = result.replaceAll("$'", '');
+  result = result.replaceAll("$'", () => '');
 
   // Handle $$ (literal $)
-  result = result.replaceAll('$$', '\u0000DOLLAR\u0000');
+  result = result.replaceAll('$$', '\u{0}DOLLAR\u{0}');
 
   // Handle $n and $nn (numbered capture groups)
   result = result.replaceAll(/\$(\d{1,2})/g, (_match, groupNumber) => {
-    const index = Number.parseInt(groupNumber, 10);
+    const index = Number(groupNumber);
     if (index < match.length) {
       return match[index] ?? '';
     }
@@ -1541,7 +1542,7 @@ const applyRegexReplacement = (originalText, regex, replacement) => {
   });
 
   // Restore literal $
-  result = result.replaceAll('\u0000DOLLAR\u0000', '$');
+  result = result.replaceAll('\u{0}DOLLAR\u{0}', '$');
   return result;
 };
 
@@ -1604,6 +1605,15 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, pr
       regex = builtRegex;
     }
   }
+  const lineOffsets = [];
+  let lineOffset = 0;
+  for (let row = 0; row < lines.length; row++) {
+    lineOffsets[row] = lineOffset;
+    lineOffset += lines[row].length + 1;
+  }
+  const getOffset = (rowIndex, columnIndex) => {
+    return lineOffsets[rowIndex] + columnIndex;
+  };
   for (let i = fromIndex; i < toIndex; i++) {
     const rowIndex = matches[i * 3];
     const startColumnIndex = matches[i * 3 + 1];
@@ -1625,18 +1635,8 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, pr
     if (preserveCaseOption) {
       finalReplacement = preserveCase$1(originalText, finalReplacement);
     }
-
-    // Convert row/column positions to character offsets
-    let startOffset = 0;
-    for (let row = 0; row < rowIndex; row++) {
-      startOffset += lines[row].length + 1; // +1 for newline character
-    }
-    startOffset += startColumnIndex;
-    let endOffset = 0;
-    for (let row = 0; row < rowIndex; row++) {
-      endOffset += lines[row].length + 1; // +1 for newline character
-    }
-    endOffset += endColumnIndex;
+    const startOffset = getOffset(rowIndex, startColumnIndex);
+    const endOffset = getOffset(rowIndex, endColumnIndex);
     edits.push({
       endOffset,
       inserted: finalReplacement,
@@ -2472,6 +2472,9 @@ const getSearchFieldButtonVirtualDom = button => {
 };
 
 const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus, extraClassName, autofocus = false) => {
+  if (outsideButtons.length > 0) {
+    throw new Error('outsideButtons are deprecated');
+  }
   const dom = [{
     childCount: 2,
     className: mergeClassNames(SearchField, extraClassName),
@@ -2488,17 +2491,14 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
     placeholder,
     spellcheck: false,
     type: TextArea,
-    ...(autofocus ? {
+    ...(autofocus && {
       autofocus: true
-    } : {})
+    })
   }, {
     childCount: insideButtons.length,
     className: SearchFieldButtons,
     type: Div
   }, ...insideButtons.flatMap(getSearchFieldButtonVirtualDom)];
-  if (outsideButtons.length > 0) {
-    throw new Error('outsideButtons are deprecated');
-  }
   return dom;
 };
 

package/package.json

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