@lvce-editor/static-server 0.43.3 → 0.43.4

package/static/{6c4895a → b6629a7}/packages/text-search-worker/dist/textSearchWorkerMain.js

@@ -1196,7 +1196,8 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
     handleOffset: 0,
     focusSource: User,
     flags: 0,
-    platform
+    platform,
+    searchInputErrorMessage: ''
   };
   set(uid, state, state);
   return state;
@@ -1245,6 +1246,8 @@ const PreserveCase$2 = 'Preserve Case';
 const Refresh$1 = 'Refresh';
 const Replace = 'Replace';
 const ReplaceAll$1 = 'Replace All';
+const ReplacedManyOccurrencesInManyFiles = "Replaced {PH1} occurrences across {PH2} files with '{PH3}'";
+const ReplacedOneOccurrenceInOneFile = "Replaced 1 occurrence across 1 file with '{PH1}'";
 const ToggleReplace$1 = 'Toggle Replace';
 const UseRegularExpression$2 = 'Use Regular Expression';
 const ViewAsTree = 'View as Tree';
@@ -1321,6 +1324,24 @@ const confirmReplaceManyOccurrencesInManyFilesNoValue = (matchCount, fileCount)
     PH2: fileCount
   });
 };
+const replacedOneOccurrenceInOneFile = replacement => {
+  return i18nString(ReplacedOneOccurrenceInOneFile, {
+    PH1: replacement
+  });
+};
+const replacedManyOccurrencesInOneFile = (matchCount, replacement) => {
+  return i18nString(ReplacedOneOccurrenceInOneFile, {
+    PH1: matchCount,
+    PH2: replacement
+  });
+};
+const replacedManyOccurrencesInManyFiles = (matchCount, fileCount, replacement) => {
+  return i18nString(ReplacedManyOccurrencesInManyFiles, {
+    PH1: matchCount,
+    PH2: fileCount,
+    PH3: replacement
+  });
+};
 const replaceAll$1 = () => {
   return i18nString(ReplaceAll$1);
 };
@@ -1513,22 +1534,6 @@ const MatchCase$1 = 1 << 4; // 16
 const DetailsExpanded = 1 << 5; // 32
 const OpenEditors = 1 << 6; // 64
 const UseIgnoreFiles = 1 << 7; // 128
-
-const hasPreserveCase = flags => {
-  return (flags & PreserveCase$1) === PreserveCase$1;
-};
-const hasUseRegularExpression = flags => {
-  return (flags & UseRegularExpression$1) === UseRegularExpression$1;
-};
-const hasReplaceExpanded = flags => {
-  return (flags & ReplaceExpanded) === ReplaceExpanded;
-};
-const hasMatchWholeWord = flags => {
-  return (flags & MatchWholeWord$1) === MatchWholeWord$1;
-};
-const hasMatchCase = flags => {
-  return (flags & MatchCase$1) === MatchCase$1;
-};
 const hasDetailsExpanded = flags => {
   return (flags & DetailsExpanded) === DetailsExpanded;
 };
@@ -1641,7 +1646,7 @@ const focusSearchValue$1 = state => {
 };
 
 const focusSearchValueNext = state => {
-  if (hasReplaceExpanded(state.flags)) {
+  if (state.flags & ReplaceExpanded) {
     return focusReplaceValue$1(state);
   }
   return focusMatchCase$1(state);
@@ -1654,6 +1659,7 @@ const Tree = 'tree';
 const TreeItem$1 = 'treeitem';
 const ToolBar = 'toolbar';
 const Button$2 = 'button';
+const Alert = 'alert';
 
 const Actions = 'Actions';
 const Badge = 'Badge';
@@ -1687,6 +1693,7 @@ const SearchFieldButton = 'SearchFieldButton';
 const SearchFieldButtonChecked = 'SearchFieldButtonChecked';
 const SearchFieldButtons = 'SearchFieldButtons';
 const SearchFieldContainer = 'SearchFieldContainer';
+const SearchFieldError = 'SearchFieldError';
 const SearchHeader = 'SearchHeader';
 const SearchHeaderDetails = 'SearchHeaderDetails';
 const SearchHeaderDetailsExpanded = 'SearchHeaderDetailsExpanded';
@@ -1694,6 +1701,7 @@ const SearchHeaderDetailsExpandedTop = 'SearchHeaderDetailsExpandedTop';
 const SearchHeaderDetailsHeading = 'SearchHeaderDetailsHeading';
 const SearchHeaderTop = 'SearchHeaderTop';
 const SearchHeaderTopRight = 'SearchHeaderTopRight';
+const SearchInputError = 'SearchInputError';
 const SearchRemove = 'SearchRemove';
 const SearchToggleButton = 'SearchToggleButton';
 const SearchToggleButtonExpanded = 'SearchToggleButtonExpanded';
@@ -2094,14 +2102,16 @@ const getOutSideButtonsDom = outsideButtons => {
     postNodes: outsideButtons.flatMap(getSearchFieldButtonVirtualDom)
   };
 };
-const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus = '') => {
+
+const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus = '', hasError = false) => {
   const {
     preNodes,
     postNodes
   } = getOutSideButtonsDom(outsideButtons);
+  const searchFieldClassName = hasError ? mergeClassNames(SearchField, SearchFieldError) : SearchField;
   const dom = [...preNodes, {
     type: Div,
-    className: SearchField,
+    className: searchFieldClassName,
     role: None,
     childCount: 2
   }, {
@@ -2155,17 +2165,17 @@ const getSearchHeaderDetailsVirtualDom = (flags, message) => {
 const getInputActionsInput = flags => {
   const inside = [{
     icon: MaskIconCaseSensitive,
-    checked: hasMatchCase(flags),
+    checked: Boolean(flags & MatchCase$1),
     title: matchCase(),
     name: MatchCase
   }, {
     icon: MaskIconWholeWord,
-    checked: hasMatchWholeWord(flags),
+    checked: Boolean(flags & MatchWholeWord$1),
     title: matchWholeWord(),
     name: MatchWholeWord
   }, {
     icon: MaskIconRegex,
-    checked: hasUseRegularExpression(flags),
+    checked: Boolean(flags & UseRegularExpression$1),
     title: useRegularExpression(),
     name: UseRegularExpression
   }];
@@ -2179,7 +2189,7 @@ const getInputActionsInput = flags => {
 const getInputActionsReplace = flags => {
   const inside = [{
     icon: MaskIconPreserveCase,
-    checked: hasPreserveCase(flags),
+    checked: Boolean(flags & PreserveCase$1),
     title: preserveCase(),
     name: PreserveCase
   }];
@@ -2198,21 +2208,21 @@ const getInputActionsReplace = flags => {
 const getSearchToggleVirtualDom = flags => {
   return [{
     type: Button,
-    className: mergeClassNames(IconButton, SearchToggleButton, hasReplaceExpanded(flags) ? SearchToggleButtonExpanded : ''),
+    className: mergeClassNames(IconButton, SearchToggleButton, flags & ReplaceExpanded ? SearchToggleButtonExpanded : ''),
     title: toggleReplace$1(),
     ariaLabel: toggleReplace$1(),
-    ariaExpanded: hasReplaceExpanded(flags),
+    ariaExpanded: Boolean(flags & ReplaceExpanded),
     childCount: 1,
     'data-command': 'toggleReplace',
     name: ToggleReplace
   }, {
     type: Div,
-    className: mergeClassNames(MaskIcon, hasReplaceExpanded(flags) ? MaskIconChevronDown : MaskIconChevronRight),
+    className: mergeClassNames(MaskIcon, flags & ReplaceExpanded ? MaskIconChevronDown : MaskIconChevronRight),
     childCount: 0
   }];
 };
 
-const getSearchHeaderTopVirtualDom = flags => {
+const getSearchHeaderTopVirtualDom = (flags, searchInputErrorMessage = '') => {
   const inputActions = getInputActionsInput(flags);
   const replaceActions = getInputActionsReplace(flags);
   const dom = [{
@@ -2224,15 +2234,15 @@ const getSearchHeaderTopVirtualDom = flags => {
     type: Div,
     className: SearchHeaderTopRight,
     role: None,
-    childCount: hasReplaceExpanded(flags) ? 2 : 1
-  }, ...getSearchFieldVirtualDom(SearchValue, 'Search', HandleInput, inputActions.inside, inputActions.outside)];
-  if (hasReplaceExpanded(flags)) {
+    childCount: flags & ReplaceExpanded ? 2 : 1
+  }, ...getSearchFieldVirtualDom(SearchValue, 'Search', HandleInput, inputActions.inside, inputActions.outside, '', Boolean(searchInputErrorMessage))];
+  if (flags & ReplaceExpanded) {
     dom.push(...getSearchFieldVirtualDom(ReplaceValue, 'Replace', HandleReplaceInput, replaceActions.inside, replaceActions.outside));
   }
   return dom;
 };
 
-const getSearchHeaderVirtualDom = (flags, message) => {
+const getSearchHeaderVirtualDom = (flags, message, searchInputErrorMessage) => {
   const dom = [{
     type: Div,
     className: SearchHeader,
@@ -2240,10 +2250,22 @@ const getSearchHeaderVirtualDom = (flags, message) => {
     childCount: 2,
     onClick: HandleHeaderClick,
     onFocusIn: HandleHeaderFocusIn
-  }, ...getSearchHeaderTopVirtualDom(flags), ...getSearchHeaderDetailsVirtualDom(flags, message)];
+  }, ...getSearchHeaderTopVirtualDom(flags, searchInputErrorMessage), ...getSearchHeaderDetailsVirtualDom(flags, message)];
   return dom;
 };
 
+const getSearchInputErrorVirtualDom = errorMessage => {
+  if (!errorMessage) {
+    return [];
+  }
+  return [{
+    type: Div,
+    className: SearchInputError,
+    role: Alert,
+    childCount: 1
+  }, text(errorMessage)];
+};
+
 const getBadgeVirtualDom = (className, count) => {
   return [{
     type: Div,
@@ -2390,13 +2412,14 @@ const getSearchResultsVirtualDom = (visibleItems, focusOutline) => {
   }, ...visibleItems.flatMap(getSearchResultVirtualDom)];
 };
 
-const getSearchVirtualDom = (visibleItems, flags, message, focusOutline) => {
-  const dom = [{
+const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchInputErrorMessage) => {
+  const errorDom = getSearchInputErrorVirtualDom(searchInputErrorMessage);
+  const childCount = 2 + (errorDom.length > 0 ? 1 : 0);
+  return [{
     type: Div,
     className: mergeClassNames(Viewlet, Search$1),
-    childCount: 2
-  }, ...getSearchHeaderVirtualDom(flags, message), ...getSearchResultsVirtualDom(visibleItems, focusOutline)];
-  return dom;
+    childCount
+  }, ...getSearchHeaderVirtualDom(flags, message, searchInputErrorMessage), ...errorDom, ...getSearchResultsVirtualDom(visibleItems, focusOutline)];
 };
 
 const handleError = error => {
@@ -2430,6 +2453,15 @@ const getNumberOfVisibleItems = (listHeight, itemHeight) => {
   return Math.ceil(listHeight / itemHeight) + 1;
 };
 
+const RE_PROTOCOL = /^([a-z-\d]+):\/\//;
+const getProtocol$1 = uri => {
+  const protocolMatch = uri.match(RE_PROTOCOL);
+  if (protocolMatch) {
+    return protocolMatch[1];
+  }
+  return '';
+};
+
 const getTextSearchResultCounts = results => {
   let resultCount = 0;
   let fileCount = 0;
@@ -2489,15 +2521,6 @@ const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
   };
 };
 
-const RE_PROTOCOL = /^([a-z-\d]+):\/\//;
-const getProtocol$1 = uri => {
-  const protocolMatch = uri.match(RE_PROTOCOL);
-  if (protocolMatch) {
-    return protocolMatch[1];
-  }
-  return '';
-};
-
 const textSearch$6 = async (scheme, root, query) => {
   string(scheme);
   string(query);
@@ -2700,6 +2723,26 @@ const textSearch = async (root, query, options, assetDir, platform) => {
   return results;
 };
 
+// Based on https://github.com/microsoft/vscode/blob/ad375c92764b72a1f28f3e1626563e9e41e5c740/src/vs/workbench/contrib/search/browser/searchWidget.ts#L393 by Microsoft (License MIT)
+
+const validateSearchInput = (value, flags) => {
+  if (value.length === 0) {
+    return '';
+  }
+  if (!(flags & UseRegularExpression$1)) {
+    return '';
+  }
+  try {
+    new RegExp(value, 'u');
+  } catch (error) {
+    if (error && error instanceof Error) {
+      return error.message;
+    }
+    return '';
+  }
+  return '';
+};
+
 const handleUpdate = async (state, update) => {
   const partialNewState = {
     ...state,
@@ -2713,7 +2756,9 @@ const handleUpdate = async (state, update) => {
       headerHeight,
       flags,
       value,
-      threads
+      threads,
+      includeValue,
+      excludeValue
     } = partialNewState;
     if (isEmptyString(value)) {
       return {
@@ -2725,14 +2770,30 @@ const handleUpdate = async (state, update) => {
         listItems: [],
         matchCount: 0,
         message: '',
-        loaded: true
+        loaded: true,
+        searchInputErrorMessage: ''
+      };
+    }
+    const searchInputErrorMessage = validateSearchInput(value, flags);
+    if (searchInputErrorMessage) {
+      return {
+        ...partialNewState,
+        searchInputErrorMessage: searchInputErrorMessage
       };
     }
     const root = state.workspacePath;
+    const scheme = getProtocol$1(root);
     const results = await textSearch(root, value, {
       threads,
-      isCaseSensitive: hasMatchCase(flags),
-      useRegularExpression: hasUseRegularExpression(flags)
+      isCaseSensitive: Boolean(flags & MatchCase$1),
+      useRegularExpression: Boolean(flags & UseRegularExpression$1),
+      exclude: excludeValue,
+      include: includeValue,
+      assetDir: state.assetDir,
+      root,
+      query: value,
+      scheme,
+      flags
     }, state.assetDir, state.platform);
     if (!Array.isArray(results)) {
       throw new TypeError('results must be of type array');
@@ -2766,7 +2827,8 @@ const handleUpdate = async (state, update) => {
       fileCount,
       matchCount: resultCount,
       loaded: true,
-      icons
+      icons,
+      searchInputErrorMessage: ''
     };
   } catch (error) {
     handleError(error);
@@ -2794,6 +2856,16 @@ const noop = state => {
   return state;
 };
 
+const getReplacedMessage = (fileCount, replaceCount, replacement) => {
+  if (replaceCount === 1) {
+    return replacedOneOccurrenceInOneFile(replacement);
+  }
+  if (fileCount === 1) {
+    return replacedManyOccurrencesInOneFile(replaceCount, replacement);
+  }
+  return replacedManyOccurrencesInManyFiles(replaceCount, fileCount, replacement);
+};
+
 const getFileName = text => {
   // TODO make api stricter so that results always have the same shape
   if (text.startsWith('./')) {
@@ -2844,31 +2916,40 @@ const replaceAll = async state => {
   const {
     workspacePath,
     items,
-    replacement
+    replacement,
+    matchCount
   } = state;
   const bulkEdits = getReplaceElements(items, workspacePath, replacement);
   await invoke$2('BulkReplacement.applyBulkReplacement', bulkEdits);
-  return state;
+  const fileCount = bulkEdits.length;
+  const message = getReplacedMessage(fileCount, matchCount, replacement);
+  return {
+    ...state,
+    items: [],
+    listItems: [],
+    minLineY: 0,
+    maxLineY: 0,
+    message
+  };
 };
 
 const toggleSearchFlag = (state, flag) => {
-  return {
-    ...state,
+  return handleUpdate(state, {
     flags: state.flags ^ flag
-  };
+  });
 };
 
-const collapseDetails = state => {
+const collapseDetails = async state => {
   return {
-    ...toggleSearchFlag(state, DetailsExpanded),
+    ...(await toggleSearchFlag(state, DetailsExpanded)),
     focus: FocusSearchInput,
     focusSource: Script
   };
 };
 
-const expandDetails = state => {
+const expandDetails = async state => {
   return {
-    ...toggleSearchFlag(state, DetailsExpanded),
+    ...(await toggleSearchFlag(state, DetailsExpanded)),
     focus: FocusSearchIncludeInput,
     focusSource: Script
   };
@@ -2967,12 +3048,11 @@ const handleIconThemeChange = async state => {
   };
 };
 
-const handleIncludeInput = (state, includeValue) => {
-  return {
-    ...state,
+const handleIncludeInput = (state, includeValue, inputSource = Script) => {
+  return handleUpdate(state, {
     includeValue,
-    focusSource: User
-  };
+    inputSource
+  });
 };
 
 const handleInput = (state, value, inputSource = Script) => {
@@ -3167,6 +3247,12 @@ const getTopHeight = flags => {
   return 61;
 };
 
+const addCollapsedPath = (collapsedPaths, path) => {
+  const pathWithDot = `.${path}`;
+  const newCollapsedPaths = [...collapsedPaths, path, pathWithDot];
+  return newCollapsedPaths;
+};
+
 const getFilteredResults = (results, collapsedPaths) => {
   if (collapsedPaths.length === 0) {
     return results;
@@ -3195,9 +3281,7 @@ const selectIndexFile = (state, searchResult, index) => {
     maxLineY
   } = state;
   const path = getAbsolutePath(searchResult.text);
-  string(path);
-  const pathWithDot = `.${path}`;
-  const newCollapsedPaths = [...collapsedPaths, path, pathWithDot];
+  const newCollapsedPaths = addCollapsedPath(collapsedPaths, path);
   const filteredResults = getFilteredResults(items, collapsedPaths);
   const newMaxLineY = Math.min(maxLineY, filteredResults.length);
   return {
@@ -3492,12 +3576,12 @@ const getFocusSelector = focusKey => {
 
 const renderItems = {
   isEqual(oldState, newState) {
-    return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.replacement === newState.replacement && oldState.flags === newState.flags && oldState.message === newState.message && oldState.loaded === newState.loaded && oldState.collapsedPaths === newState.collapsedPaths && oldState.listFocusedIndex === newState.listFocusedIndex && oldState.listFocused === newState.listFocused && oldState.icons === newState.icons;
+    return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.replacement === newState.replacement && oldState.flags === newState.flags && oldState.message === newState.message && oldState.loaded === newState.loaded && oldState.collapsedPaths === newState.collapsedPaths && oldState.listFocusedIndex === newState.listFocusedIndex && oldState.listFocused === newState.listFocused && oldState.icons === newState.icons && oldState.searchInputErrorMessage === newState.searchInputErrorMessage;
   },
   apply(oldState, newState) {
     const displayResults = getDisplayResults(newState.listItems, newState.itemHeight, newState.fileCount, newState.value, newState.minLineY, newState.maxLineY, newState.replacement, newState.icons, newState.listFocusedIndex);
     const focusOutline = newState.listFocused && newState.listFocusedIndex === -1;
-    const dom = getSearchVirtualDom(displayResults, newState.flags, newState.message, focusOutline);
+    const dom = getSearchVirtualDom(displayResults, newState.flags, newState.message, focusOutline, newState.searchInputErrorMessage);
     return ['Viewlet.setDom2', newState.uid, dom];
   }
 };
@@ -3531,8 +3615,7 @@ const renderIncludeValue = {
     return oldState.includeValue === newState.includeValue || newState.inputSource === User;
   },
   apply(oldState, newState) {
-    const selector = getFocusSelector(FocusSearchIncludeInput);
-    return ['Viewlet.send', newState.uid, 'setValue', newState.includeValue, selector];
+    return ['Viewlet.send', newState.uid, 'setValue', newState.includeValue, `[name=${FilesToInclude}]`];
   }
 };
 const renderExcludeValue = {
@@ -3540,8 +3623,7 @@ const renderExcludeValue = {
     return oldState.excludeValue === newState.excludeValue || newState.inputSource === User;
   },
   apply(oldState, newState) {
-    const selector = getFocusSelector(FocusSearchExcludeInput);
-    return ['Viewlet.send', newState.uid, 'setValue', newState.excludeValue, selector];
+    return ['Viewlet.send', newState.uid, 'setValue', newState.excludeValue, `[name=${FilesToExclude}]`];
   }
 };
 const render = [renderItems, renderValue, renderIncludeValue, renderExcludeValue, renderReplacement, renderFocus];
@@ -3666,7 +3748,7 @@ const focusSearchValue = state => {
   return focusElement(state, FocusSearchInput);
 };
 const focusMatchCasePrevious = state => {
-  if (hasReplaceExpanded(state.flags)) {
+  if (state.flags & ReplaceExpanded) {
     return focusReplaceValue(state);
   }
   return focusSearchValue(state);
@@ -3816,6 +3898,7 @@ const commandMap = {
   'TextSearch.refresh': wrapCommand(refresh),
   'TextSearch.replaceAll': wrapCommand(replaceAll),
   'TextSearch.replaceAllAndPrompt': wrapCommand(replaceAllAndPrompt),
+  'TextSearch.selectIndex': wrapCommand(selectIndex),
   'TextSearch.submit': wrapCommand(submit),
   'TextSearch.toggleMatchCase': wrapCommand(toggleMatchCase),
   'TextSearch.toggleMatchWholeWord': wrapCommand(toggleMatchWholeWord),

package/static/index.html

@@ -6,9 +6,9 @@
     <meta name="description" content="VS Code inspired text editor that mostly runs in a webworker." />
     <meta name="theme-color" content="#282e2f" />
     <title>Lvce Editor</title>
-    <link rel="stylesheet" href="/6c4895a/css/App.css" />
-    <link rel="manifest" href="/6c4895a/manifest.json" crossorigin="use-credentials" />
-    <link rel="apple-touch-icon" href="/6c4895a/icons/pwa-icon-192.png" />
-    <script type="module" src="/6c4895a/packages/renderer-process/dist/rendererProcessMain.js"></script>
+    <link rel="stylesheet" href="/b6629a7/css/App.css" />
+    <link rel="manifest" href="/b6629a7/manifest.json" crossorigin="use-credentials" />
+    <link rel="apple-touch-icon" href="/b6629a7/icons/pwa-icon-192.png" />
+    <script type="module" src="/b6629a7/packages/renderer-process/dist/rendererProcessMain.js"></script>
   </head>
 </html>