@lvce-editor/find-widget-worker 1.14.0 → 1.15.0

package/dist/findWidgetWorkerMain.js

@@ -1013,6 +1013,10 @@ const RenderFocus = 15;
 const RenderValue = 16;
 const RenderReplaceValue = 17;
 
+const CheckBox = 'checkbox';
+const Group = 'group';
+const None = 'none';
+
 const Button = 1;
 const Div = 4;
 const Text = 12;
@@ -1126,7 +1130,7 @@ const activateByEvent = async event => {
   // @ts-ignore
   await invoke$1('ActivateByEvent.activateByEvent', event);
 };
-const applyEdit$1 = async (editorUid, changes) => {
+const applyEdit = async (editorUid, changes) => {
   // @ts-ignore
   await invoke$1('Editor.applyEdit2', editorUid, changes);
 };
@@ -1191,7 +1195,7 @@ const registerMockRpc = commandMap => {
 const EditorWorker = {
   __proto__: null,
   activateByEvent,
-  applyEdit: applyEdit$1,
+  applyEdit,
   applyWorkspaceEdit,
   closeWidget,
   dispose,
@@ -1215,9 +1219,7 @@ const EditorWorker = {
 
 const {
   invoke,
-  set,
-  applyEdit
-} = EditorWorker;
+  set} = EditorWorker;
 
 const setSelections = async (editorUid, selections) => {
   // @ts-ignore
@@ -1290,21 +1292,21 @@ const handleBlur = async state => {
   };
 };
 
-const handleClickButton = async (state, name) => {
-  return state;
-};
-
-const close$1 = async state => {
-  const {
-    editorUid
-  } = state;
+const escapeRegExpCharacters = value => {
   // @ts-ignore
-  await invoke('Editor.closeFind2', editorUid);
-  return state;
+  return RegExp.escape(value);
 };
 
-const handleClickClose = state => {
-  return close$1(state);
+const buildRegex = (searchString, options) => {
+  const {
+    matchCase,
+    useRegularExpression,
+    matchWholeWord
+  } = options;
+  const flags = matchCase ? 'g' : 'gi';
+  const pattern = useRegularExpression ? searchString : escapeRegExpCharacters(searchString);
+  const wrapped = matchWholeWord ? `\\b(?:${pattern})\\b` : pattern;
+  return new RegExp(wrapped, flags);
 };
 
 const findRegexMatches = (lines, regex) => {
@@ -1329,22 +1331,11 @@ const findRegexMatches = (lines, regex) => {
   return new Uint32Array(matches);
 };
 
-const escapeRegExpCharacters = value => {
-  // @ts-ignore
-  return RegExp.escape(value);
-};
-
-const regexFlags = 'gi';
-const getSearchRegex = searchString => {
-  const escaped = escapeRegExpCharacters(searchString);
-  return new RegExp(escaped, regexFlags);
-};
-
-const findMatchesCaseInsensitive = (lines, searchString) => {
+const findMatches = (lines, searchString, options) => {
   if (searchString.length === 0) {
     return new Uint32Array([]);
   }
-  const regex = getSearchRegex(searchString);
+  const regex = buildRegex(searchString, options);
   return findRegexMatches(lines, regex);
 };
 
@@ -1354,9 +1345,17 @@ const getMatchCount = matches => {
 
 const refresh$1 = (state, value, inputSource) => {
   const {
-    lines
+    lines,
+    matchCase,
+    useRegularExpression,
+    matchWholeWord
   } = state;
-  const matches = findMatchesCaseInsensitive(lines, value);
+  const options = {
+    matchCase,
+    useRegularExpression,
+    matchWholeWord
+  };
+  const matches = findMatches(lines, value, options);
   const matchCount = getMatchCount(matches);
   return {
     ...state,
@@ -1372,21 +1371,169 @@ const refresh = (state, value = state.value, inputSource = User) => {
   return refresh$1(state, value, inputSource);
 };
 
-const handleInput = (state, value, inputSource = User) => {
-  return refresh(state, value, inputSource);
-};
-
 const toggleMatchCase = state => {
   const {
     matchCase
   } = state;
+  const newState = {
+    ...state,
+    matchCase: !matchCase
+  };
+  return refresh(newState, newState.value, User);
+};
+
+const toggleMatchWholeWord = state => {
+  const {
+    matchWholeWord
+  } = state;
+  const newState = {
+    ...state,
+    matchWholeWord: !matchWholeWord
+  };
+  return refresh(newState, newState.value, User);
+};
+
+const togglePreserveCase = state => {
+  const {
+    preserveCase
+  } = state;
   // TODO update search results
   return {
     ...state,
-    matchCase: !matchCase
+    preserveCase: !preserveCase
+  };
+};
+
+const toggleUseRegularExpression = state => {
+  const {
+    useRegularExpression
+  } = state;
+  const newState = {
+    ...state,
+    useRegularExpression: !useRegularExpression
+  };
+  return refresh(newState, newState.value, User);
+};
+
+const Close$2 = 'Close';
+const FocusNext = 'FocusNext';
+const FocusPrevious = 'FocusPrevious';
+const MatchCase$1 = 'MatchCase';
+const MatchWholeWord$1 = 'MatchWholeWord';
+const PreserveCase = 'PreserveCase';
+const Replace$2 = 'Replace';
+const ReplaceAll$2 = 'ReplaceAll';
+const ReplaceValue = 'replace-value';
+const SearchValue = 'search-value';
+const ToggleReplace = 'ToggleReplace';
+const UseRegularExpression$1 = 'UseRegularExpression';
+
+const applyEdits = async (editorId, edits) => {
+  // @ts-ignore
+  await invoke('Editor.applyDocumentEdits', editorId, edits);
+};
+
+const getEdits = (matches, value, replacement, startIndex, replaceAll) => {
+  if (value.length === 0 || matches.length === 0) {
+    return [];
+  }
+  const edits = [];
+  const totalMatches = Math.floor(matches.length / 2);
+  const fromIndex = replaceAll ? 0 : Math.max(0, startIndex);
+  const toIndex = replaceAll ? totalMatches : Math.min(totalMatches, fromIndex + 1);
+  for (let i = fromIndex; i < toIndex; i++) {
+    const rowIndex = matches[i * 2];
+    const startColumnIndex = matches[i * 2 + 1];
+    const endColumnIndex = startColumnIndex + value.length;
+    edits.push({
+      start: {
+        rowIndex,
+        columnIndex: startColumnIndex
+      },
+      end: {
+        rowIndex,
+        columnIndex: endColumnIndex
+      },
+      inserted: [replacement],
+      deleted: [value],
+      origin: 'find-widget.replace'
+    });
+  }
+  return edits;
+};
+
+const replace$1 = async state => {
+  const {
+    matches,
+    value,
+    replacement,
+    matchIndex,
+    editorUid
+  } = state;
+  const edits = getEdits(matches, value, replacement, matchIndex, false);
+  await applyEdits(editorUid, edits);
+  // TODO ask editor worker to apply edit
+  // TODO ask editor worker for new lines?
+  return {
+    ...state
+  };
+};
+
+const replaceAll$1 = state => {
+  const {
+    matches,
+    value,
+    replacement,
+    editorUid
+  } = state;
+  const edits = getEdits(matches, value, replacement, 0, true);
+  void applyEdits(editorUid, edits);
+  return {
+    ...state
   };
 };
 
+const getClickHandler = name => {
+  switch (name) {
+    case Replace$2:
+      return replace$1;
+    case ReplaceAll$2:
+      return replaceAll$1;
+    case MatchCase$1:
+      return toggleMatchCase;
+    case MatchWholeWord$1:
+      return toggleMatchWholeWord;
+    case UseRegularExpression$1:
+      return toggleUseRegularExpression;
+    case PreserveCase:
+      return togglePreserveCase;
+    default:
+      throw new Error(`unexpected click`);
+  }
+};
+
+const handleClickButton = async (state, name) => {
+  const fn = getClickHandler(name);
+  return fn(state);
+};
+
+const close$1 = async state => {
+  const {
+    editorUid
+  } = state;
+  // @ts-ignore
+  await invoke('Editor.closeFind2', editorUid);
+  return state;
+};
+
+const handleClickClose = state => {
+  return close$1(state);
+};
+
+const handleInput = (state, value, inputSource = User) => {
+  return refresh(state, value, inputSource);
+};
+
 const getFindWidgetHeight = replaceExpanded => {
   const collapsedHeight = 30;
   const expandedHeight = 60;
@@ -1407,16 +1554,6 @@ const toggleReplace = state => {
   };
 };
 
-const toggleUseRegularExpression = state => {
-  const {
-    useRegularExpression
-  } = state;
-  return {
-    ...state,
-    useRegularExpression: !useRegularExpression
-  };
-};
-
 const handleReplaceInput = (state, value, inputSource = User) => {
   return {
     ...state,
@@ -1425,6 +1562,20 @@ const handleReplaceInput = (state, value, inputSource = User) => {
   };
 };
 
+const regexFlags = 'gi';
+const getSearchRegex = searchString => {
+  const escaped = escapeRegExpCharacters(searchString);
+  return new RegExp(escaped, regexFlags);
+};
+
+const findMatchesCaseInsensitive = (lines, searchString) => {
+  if (searchString.length === 0) {
+    return new Uint32Array([]);
+  }
+  const regex = getSearchRegex(searchString);
+  return findRegexMatches(lines, regex);
+};
+
 const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
   const width = 300;
   const height = 30;
@@ -1551,12 +1702,12 @@ const i18nString = (key, placeholders = emptyObject) => {
 
 const MatchOf = '{PH1} of {PH2}';
 const NoResults = 'No Results';
-const Close$2 = 'Close';
+const Close$1 = 'Close';
 const PreviousMatch = 'Previous Match';
 const NextMatch = 'Next Match';
 const Find$1 = 'Find';
-const Replace$2 = 'Replace';
-const ReplaceAll$2 = 'Replace All';
+const Replace$1 = 'Replace';
+const ReplaceAll$1 = 'Replace All';
 
 const noResults = () => {
   return i18nString(NoResults);
@@ -1574,38 +1725,26 @@ const nextMatch = () => {
   return i18nString(NextMatch);
 };
 const close = () => {
-  return i18nString(Close$2);
+  return i18nString(Close$1);
 };
 const find = () => {
   return i18nString(Find$1);
 };
-const replace$1 = () => {
-  return i18nString(Replace$2);
+const replace = () => {
+  return i18nString(Replace$1);
 };
-const replaceAll$1 = () => {
-  return i18nString(ReplaceAll$2);
+const replaceAll = () => {
+  return i18nString(ReplaceAll$1);
 };
 
-const MatchCase$1 = 'CaseSensitive';
-const UseRegularExpression$1 = 'Regex';
-const MatchWholeWord$1 = 'WholeWord';
+const MatchCase = 'CaseSensitive';
+const UseRegularExpression = 'Regex';
+const MatchWholeWord = 'WholeWord';
 const ArrowDown = 'ArrowDown';
 const ArrowUp = 'ArrowUp';
-const Close$1 = 'Close';
-const Replace$1 = 'Replace';
-const ReplaceAll$1 = 'ReplaceAll';
-
 const Close = 'Close';
-const FocusNext = 'FocusNext';
-const FocusPrevious = 'FocusPrevious';
-const MatchCase = 'MatchCase';
-const MatchWholeWord = 'MatchWholeWord';
 const Replace = 'Replace';
 const ReplaceAll = 'ReplaceAll';
-const ReplaceValue = 'replace-value';
-const SearchValue = 'search-value';
-const ToggleReplace = 'ToggleReplace';
-const UseRegularExpression = 'UseRegularExpression';
 
 const getFindWidgetButtons = (findButtonsEnabled, replaceButtonsEnabled) => {
   const findButtons = [{
@@ -1622,23 +1761,23 @@ const getFindWidgetButtons = (findButtonsEnabled, replaceButtonsEnabled) => {
     name: FocusNext
   }, {
     label: close(),
-    icon: Close$1,
+    icon: Close,
     disabled: false,
     onClick: HandleClickClose,
-    name: Close
+    name: Close$2
   }];
   const replaceButtons = [{
-    label: replace$1(),
-    icon: Replace$1,
+    label: replace(),
+    icon: Replace,
     disabled: !replaceButtonsEnabled,
     onClick: HandleClickReplace,
-    name: Replace
+    name: Replace$2
   }, {
-    label: replaceAll$1(),
-    icon: ReplaceAll$1,
+    label: replaceAll(),
+    icon: ReplaceAll,
     disabled: !replaceButtonsEnabled,
     onClick: HandleClickReplaceAll,
-    name: ReplaceAll
+    name: ReplaceAll$2
   }];
   return {
     findButtons,
@@ -1667,10 +1806,6 @@ const text = data => {
   };
 };
 
-const CheckBox = 'checkbox';
-const Group = 'group';
-const None = 'none';
-
 const FindWidgetFind = 'FindWidgetFind';
 const FindWidgetMatchCount = 'FindWidgetMatchCount';
 const FindWidgetMatchCountEmpty = 'FindWidgetMatchCountEmpty';
@@ -1692,19 +1827,19 @@ const ViewletFindWidget = 'ViewletFindWidget';
 const getFindButtons = () => {
   return [{
     checked: false,
-    icon: MatchCase$1,
+    icon: MatchCase,
     title: 'Match Case',
-    name: MatchCase
+    name: MatchCase$1
   }, {
     checked: false,
-    icon: MatchWholeWord$1,
+    icon: MatchWholeWord,
     title: 'Match Whole Word',
-    name: MatchWholeWord
+    name: MatchWholeWord$1
   }, {
     checked: false,
-    icon: UseRegularExpression$1,
+    icon: UseRegularExpression,
     title: 'Use Regular Expression',
-    name: UseRegularExpression
+    name: UseRegularExpression$1
   }];
 };
 
@@ -1821,7 +1956,7 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons) => {
       type: Div,
       className: FindWidgetReplace,
       childCount: 1 + replaceButtons.length
-    }, ...getSearchFieldVirtualDom(ReplaceValue, replace$1(), HandleReplaceInput, [], [], HandleReplaceFocus), ...replaceButtons.flatMap(getIconButtonVirtualDom));
+    }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus), ...replaceButtons.flatMap(getIconButtonVirtualDom));
   }
   return dom;
 };
@@ -1964,7 +2099,7 @@ const renderReplaceValue = (oldState, newState) => {
     uid,
     replacement
   } = newState;
-  return [SetValueByName, uid, Replace, replacement];
+  return [SetValueByName, uid, Replace$2, replacement];
 };
 
 const renderUid = (oldState, newState) => {
@@ -2025,63 +2160,6 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
-const applyEdits = async (editorId, edits) => {
-  await applyEdit(editorId, edits);
-};
-
-const getEdits = (matches, value, replacement, startIndex, replaceAll) => {
-  if (value.length === 0 || matches.length === 0) {
-    return [];
-  }
-  const edits = [];
-  const totalMatches = Math.floor(matches.length / 2);
-  const fromIndex = replaceAll ? 0 : Math.max(0, startIndex);
-  const toIndex = replaceAll ? totalMatches : Math.min(totalMatches, fromIndex + 1);
-  for (let i = fromIndex; i < toIndex; i++) {
-    const rowIndex = matches[i * 2];
-    const startColumnIndex = matches[i * 2 + 1];
-    const endColumnIndex = startColumnIndex + value.length;
-    edits.push({
-      rowIndex,
-      startColumnIndex,
-      endColumnIndex,
-      newText: replacement
-    });
-  }
-  return edits;
-};
-
-const replace = async state => {
-  const {
-    matches,
-    value,
-    replacement,
-    matchIndex,
-    editorUid
-  } = state;
-  const edits = getEdits(matches, value, replacement, matchIndex, false);
-  await applyEdits(editorUid, edits);
-  // TODO ask editor worker to apply edit
-  // TODO ask editor worker for new lines?
-  return {
-    ...state
-  };
-};
-
-const replaceAll = state => {
-  const {
-    matches,
-    value,
-    replacement,
-    editorUid
-  } = state;
-  const edits = getEdits(matches, value, replacement, 0, true);
-  void applyEdits(editorUid, edits);
-  return {
-    ...state
-  };
-};
-
 const commandMap = {
   'FindWidget.create': create$1,
   'FindWidget.diff2': diff2,
@@ -2105,8 +2183,8 @@ const commandMap = {
   'FindWidget.render2': render2,
   'FindWidget.terminate': terminate,
   'FindWidget.toggleReplace': wrapCommand(toggleReplace),
-  'FindWidget.replace': wrapCommand(replace),
-  'FindWidget.replaceAll': wrapCommand(replaceAll),
+  'FindWidget.replace': wrapCommand(replace$1),
+  'FindWidget.replaceAll': wrapCommand(replaceAll$1),
   'FindWidget.handleClickButton': wrapCommand(handleClickButton),
   'FindWidget.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression)
 };

package/package.json

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