@lvce-editor/find-widget-worker 3.1.0 → 3.3.0

package/dist/findWidgetWorkerMain.js

@@ -374,7 +374,7 @@ const callbacks = Object.create(null);
 const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
 class JsonRpcError extends Error {
@@ -527,7 +527,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -834,6 +834,34 @@ const WebWorkerRpcClient = {
   __proto__: null,
   create: create$1$1
 };
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
+
+const CheckBox = 'checkbox';
+const Group = 'group';
+const None = 'none';
+
+const Button = 1;
+const Div = 4;
+const Text = 12;
+const TextArea = 62;
 
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
@@ -887,7 +915,11 @@ const set$2 = (id, rpc) => {
 const get$1 = id => {
   return rpcs[id];
 };
+const remove = id => {
+  delete rpcs[id];
+};
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$2 = rpcId => {
   return {
     async dispose() {
@@ -906,6 +938,18 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$2(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$2(rpcId, rpc);
     }
@@ -1181,16 +1225,16 @@ const focusIndex = async (state, index) => {
   const {
     editorUid,
     matches,
-    matchIndex,
-    value
+    matchIndex
   } = state;
   if (index === matchIndex) {
     return state;
   }
   // // TODO find next match and highlight it
-  const matchRowIndex = matches[index * 2];
-  const matchColumnIndex = matches[index * 2 + 1];
-  const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length]);
+  const matchRowIndex = matches[index * 3];
+  const matchColumnIndex = matches[index * 3 + 1];
+  const matchLength = matches[index * 3 + 2];
+  const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + matchLength]);
   await setSelections(editorUid, newSelections);
   return {
     ...state,
@@ -1287,17 +1331,18 @@ const findRegexMatches = (lines, regex) => {
       if (!lastMatch) {
         break;
       }
-      matches.push(i, lastMatch.index);
+      matches.push(i, lastMatch.index, lastMatch[0].length);
     } while (true);
   }
   return new Uint32Array(matches);
 };
 
+const emptyMatches$1 = new Uint32Array([]);
 const findMatches = (lines, searchString, options) => {
   if (searchString.length === 0) {
     return {
       error: '',
-      matches: new Uint32Array([])
+      matches: emptyMatches$1
     };
   }
   const {
@@ -1307,7 +1352,7 @@ const findMatches = (lines, searchString, options) => {
   if (error) {
     return {
       error,
-      matches: new Uint32Array([])
+      matches: emptyMatches$1
     };
   }
   const matches = findRegexMatches(lines, regex);
@@ -1318,7 +1363,7 @@ const findMatches = (lines, searchString, options) => {
 };
 
 const getMatchCount = matches => {
-  return matches.length / 2;
+  return matches.length / 3;
 };
 
 const measureTextHeight = (value, lineHeight) => {
@@ -1459,6 +1504,47 @@ const applyEdits = async (editorId, edits) => {
   await invoke('Editor.applyDocumentEdits', editorId, edits);
 };
 
+/**
+ * Apply regex replacement with back-reference substitution ($1, $2, etc.)
+ */
+const applyRegexReplacement = (originalText, regex, replacement) => {
+  // Create a non-global version of the regex to get capture groups
+  const flags = regex.flags.replace('g', '');
+  const nonGlobalRegex = new RegExp(regex.source, flags);
+  const match = nonGlobalRegex.exec(originalText);
+  if (!match) {
+    return replacement;
+  }
+
+  // Replace $n back-references with captured groups
+  let result = replacement;
+
+  // Handle $& (entire match)
+  result = result.replaceAll('$&', match[0]);
+
+  // Handle $` (text before match) - in this context it's empty since we're matching the whole text
+  result = result.replaceAll('$`', '');
+
+  // Handle $' (text after match) - in this context it's empty since we're matching the whole text
+  result = result.replaceAll("$'", '');
+
+  // Handle $$ (literal $)
+  result = result.replaceAll('$$', '\u0000DOLLAR\u0000');
+
+  // Handle $n and $nn (numbered capture groups)
+  result = result.replaceAll(/\$(\d{1,2})/g, (_match, groupNumber) => {
+    const index = Number.parseInt(groupNumber, 10);
+    if (index < match.length) {
+      return match[index] ?? '';
+    }
+    return `$${groupNumber}`;
+  });
+
+  // Restore literal $
+  result = result.replaceAll('\u0000DOLLAR\u0000', '$');
+  return result;
+};
+
 /**
  * Preserves the case pattern of the original text when replacing.
  * Supports uppercase, lowercase, PascalCase, and camelCase patterns.
@@ -1498,24 +1584,47 @@ const preserveCase$1 = (originalText, replacementText) => {
   return replacementText;
 };
 
-const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, preserveCaseOption = false) => {
+const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, preserveCaseOption = false, options) => {
   if (value.length === 0 || matches.length === 0) {
     return [];
   }
   const edits = [];
-  const totalMatches = Math.floor(matches.length / 2);
+  const totalMatches = Math.floor(matches.length / 3);
   const fromIndex = replaceAll ? 0 : Math.max(0, startIndex);
   const toIndex = replaceAll ? totalMatches : Math.min(totalMatches, fromIndex + 1);
+
+  // Build regex once if using regular expressions
+  let regex;
+  if (options?.useRegularExpression) {
+    const {
+      error,
+      regex: builtRegex
+    } = buildRegex(value, options);
+    if (!error) {
+      regex = builtRegex;
+    }
+  }
   for (let i = fromIndex; i < toIndex; i++) {
-    const rowIndex = matches[i * 2];
-    const startColumnIndex = matches[i * 2 + 1];
-    const endColumnIndex = startColumnIndex + value.length;
+    const rowIndex = matches[i * 3];
+    const startColumnIndex = matches[i * 3 + 1];
+    const matchLength = matches[i * 3 + 2];
+    const endColumnIndex = startColumnIndex + matchLength;
 
     // Get the original text that was matched
     const originalText = lines[rowIndex].slice(startColumnIndex, endColumnIndex);
 
+    // Apply regex replacement with back-references if enabled
+    let finalReplacement;
+    if (options?.useRegularExpression && regex) {
+      finalReplacement = applyRegexReplacement(originalText, regex, replacement);
+    } else {
+      finalReplacement = replacement;
+    }
+
     // Apply case preservation if enabled
-    const finalReplacement = preserveCaseOption ? preserveCase$1(originalText, replacement) : replacement;
+    if (preserveCaseOption) {
+      finalReplacement = preserveCase$1(originalText, finalReplacement);
+    }
 
     // Convert row/column positions to character offsets
     let startOffset = 0;
@@ -1538,39 +1647,86 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, pr
   return edits;
 };
 
+const getLines = async editorUid => {
+  const lines = await getLines$1(editorUid);
+  return lines;
+};
+
+const updateAfterReplace = async (state, matchIndex) => {
+  const {
+    editorUid,
+    matchCase,
+    matchWholeWord,
+    useRegularExpression,
+    value
+  } = state;
+  const options = {
+    matchCase,
+    matchWholeWord,
+    useRegularExpression
+  };
+  const newLines = await getLines(editorUid);
+  const {
+    error,
+    matches: newMatches
+  } = findMatches(newLines, value, options);
+  const newMatchCount = getMatchCount(newMatches);
+
+  // Keep matchIndex in bounds, or reset to 0 if no matches remain
+  const newMatchIndex = newMatchCount === 0 ? 0 : Math.min(matchIndex, newMatchCount - 1);
+  return {
+    ...state,
+    inputErrorMessage: error,
+    lines: newLines,
+    matchCount: newMatchCount,
+    matches: newMatches,
+    matchIndex: newMatchIndex
+  };
+};
+
 const replace$1 = async state => {
   const {
     editorUid,
     lines,
+    matchCase,
     matches,
     matchIndex,
+    matchWholeWord,
     preserveCase,
     replacement,
+    useRegularExpression,
     value
   } = state;
-  const edits = getEdits(matches, value, replacement, matchIndex, false, lines, preserveCase);
-  await applyEdits(editorUid, edits);
-  // TODO ask editor worker to apply edit
-  // TODO ask editor worker for new lines?
-  return {
-    ...state
+  const options = {
+    matchCase,
+    matchWholeWord,
+    useRegularExpression
   };
+  const edits = getEdits(matches, value, replacement, matchIndex, false, lines, preserveCase, options);
+  await applyEdits(editorUid, edits);
+  return updateAfterReplace(state, matchIndex);
 };
 
-const replaceAll$1 = state => {
+const replaceAll$1 = async state => {
   const {
     editorUid,
     lines,
+    matchCase,
     matches,
+    matchWholeWord,
     preserveCase,
     replacement,
+    useRegularExpression,
     value
   } = state;
-  const edits = getEdits(matches, value, replacement, 0, true, lines, preserveCase);
-  void applyEdits(editorUid, edits);
-  return {
-    ...state
+  const options = {
+    matchCase,
+    matchWholeWord,
+    useRegularExpression
   };
+  const edits = getEdits(matches, value, replacement, 0, true, lines, preserveCase, options);
+  await applyEdits(editorUid, edits);
+  return updateAfterReplace(state, 0);
 };
 
 const getClickHandler = name => {
@@ -1605,7 +1761,7 @@ const handleFindWidgetFocus = (state, focusKey) => {
   const {
     focus
   } = state;
-  if (focus === focusKey) {
+  if (!focusKey || focus === focusKey) {
     return state;
   }
   return {
@@ -1619,6 +1775,7 @@ const handleFindFocus = state => {
   return handleFindWidgetFocus(state, FindWidget$1);
 };
 
+// TODO maybe use one handleFocus function with a name parameter
 const handleReplaceFocus = state => {
   return handleFindWidgetFocus(state, FocusFindWidgetReplace);
 };
@@ -1822,6 +1979,10 @@ const getKeyBindings = () => {
     command: 'FindWidget.focusPreviousMatchButton',
     key: Tab,
     when: FocusFindWidgetReplace$1
+  }, {
+    command: 'FindWidget.replace',
+    key: Enter,
+    when: FocusFindWidgetReplace$1
   }, {
     command: 'FindWidget.replaceAll',
     key: Alt | CtrlCmd | Enter,
@@ -1910,12 +2071,10 @@ const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
   };
 };
 
-const getLines = async editorUid => {
-  const lines = await getLines$1(editorUid);
-  return lines;
-};
-
 const getSelectedText = (lines, selections) => {
+  if (selections.length === 0) {
+    return '';
+  }
   const startRowIndex = selections[0];
   const startColumnIndex = selections[1];
   const endColumnIndex = selections[3];
@@ -2198,24 +2357,15 @@ const getFindWidgetButtonsEnabled = (matchCount, value) => {
   };
 };
 
-const CheckBox = 'checkbox';
-const Group = 'group';
-const None = 'none';
-
-const Button = 1;
-const Div = 4;
-const Text = 12;
-const TextArea = 62;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };
 
@@ -2514,7 +2664,7 @@ const getEventListeners = (uid, widgetId) => {
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleBlur', 0, widgetId]
   }, {
     name: HandleReplaceInput,
-    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleReplaceInput', 0, widgetId]
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleReplaceInput', 0, widgetId, TargetValue]
   }, {
     name: HandleReplaceFocus,
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleReplaceFocus', 0, widgetId]

package/package.json

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