@lvce-editor/text-search-view 1.14.3 → 1.16.0

package/dist/settings.json

@@ -4,7 +4,7 @@
     "description": "Configures glob patterns for excluding files and folders from text search results.",
     "heading": "Exclude",
     "id": "search.exclude",
-    "type": 4,
+    "type": "array",
     "value": {}
   },
   {
@@ -13,7 +13,7 @@
     "heading": "Search Threads",
     "id": "search.threads",
     "minimum": 1,
-    "type": 5,
+    "type": "number",
     "value": 1
   }
 ]

package/dist/textSearchViewMain.js

@@ -3733,7 +3733,7 @@ const handleUpdateError = async (state, update, error) => {
     ...state,
     ...update
   };
-  const message = `${error}`;
+  const message = String(error);
   const messageHeight = await getSearchMessageHeight(message, partialNewState.width, partialNewState.flags);
   const headerHeight = partialNewState.headerHeight + messageHeight - partialNewState.messageHeight;
   return {
@@ -4014,7 +4014,7 @@ const handleUpdateIncremental = async (state, update) => {
   return state;
 };
 
-const getsearchid = () => {
+const getSearchId = () => {
   return crypto.randomUUID();
 };
 const handleUpdatePullBased = async (state, update) => {
@@ -4022,7 +4022,7 @@ const handleUpdatePullBased = async (state, update) => {
     uid: previousUid,
     workspacePath
   } = state;
-  const searchId = getsearchid();
+  const searchId = getSearchId();
   const partialNewState = {
     ...state,
     ...update,
@@ -5183,46 +5183,6 @@ const handleWorkspaceChange = (state, workspacePath) => {
   };
 };
 
-const send$2 = async port => {
-  await sendMessagePortToIconThemeWorker(port, 0);
-};
-const launchIconThemeWorker = async () => {
-  // TODO connect to icon theme worker
-  const rpc = await create$5({
-    commandMap: {},
-    send: send$2
-  });
-  return rpc;
-};
-
-const initializeIconThemeWorker = async () => {
-  const rpc = await launchIconThemeWorker();
-  set$6(rpc);
-};
-
-const commandMap$1 = {
-  'TextSearch.handlePullResultsFound': wrapCommand(handlePullResultsFound)
-};
-
-const send$1 = async port => {
-  await sendMessagePortToTextSearchWorker(port, 0);
-};
-const launchTextSearchWorker = async () => {
-  return create$5({
-    commandMap: commandMap$1,
-    send: send$1
-  });
-};
-
-const initializeTextSearchWorker = async () => {
-  const rpc = await launchTextSearchWorker();
-  set$3(rpc);
-};
-
-const initialize = async () => {
-  await Promise.all([initializeTextSearchWorker(), initializeIconThemeWorker()]);
-};
-
 // TODO optimize this function to return the minimum number
 // of visible items needed, e.g. when not scrolled 5 items with
 // 20px fill 100px but when scrolled 6 items are needed
@@ -5675,9 +5635,20 @@ const getUsePullBasedSearch = async () => {
   }
 };
 
+const loadPreferences = async currentDefaultExcludes => {
+  const [defaultExcludes, usePullBasedSearch] = await Promise.all([getSearchExcludes(currentDefaultExcludes), getUsePullBasedSearch()]);
+  return {
+    defaultExcludes,
+    usePullBasedSearch
+  };
+};
+
 const hasProperty = (object, key) => {
   return !!object && typeof object === 'object' && key in object;
 };
+const hasStringProperty = (object, key) => {
+  return hasProperty(object, key) && typeof object[key] === 'string';
+};
 
 const getSavedFocus = savedState => {
   if (hasProperty(savedState, 'focus') && typeof savedState.focus === 'number') {
@@ -5703,13 +5674,13 @@ const getSavedHistory = savedState => {
 };
 
 const getSavedValue = savedState => {
-  if (hasProperty(savedState, 'value') && typeof savedState.value === 'string') {
+  if (hasStringProperty(savedState, 'value')) {
     return savedState.value;
   }
   return '';
 };
 const getSavedReplacement = savedState => {
-  if (hasProperty(savedState, 'replacement') && typeof savedState.replacement === 'string') {
+  if (hasStringProperty(savedState, 'replacement')) {
     return savedState.replacement;
   }
   return '';
@@ -5721,13 +5692,13 @@ const getSavedFlags = savedState => {
   return UseIgnoreFiles;
 };
 const getSavedIncludeValue = savedState => {
-  if (hasProperty(savedState, 'includeValue') && typeof savedState.includeValue === 'string') {
+  if (hasStringProperty(savedState, 'includeValue')) {
     return savedState.includeValue;
   }
   return '';
 };
 const getSavedExcludeValue = savedState => {
-  if (hasProperty(savedState, 'excludeValue') && typeof savedState.excludeValue === 'string') {
+  if (hasStringProperty(savedState, 'excludeValue')) {
     return savedState.excludeValue;
   }
   return '';
@@ -5770,8 +5741,10 @@ const loadContent = async (state, savedState) => {
     savedValue,
     threads
   } = restoreState(savedState);
-  const defaultExcludes = await getSearchExcludes(currentDefaultExcludes);
-  const usePullBasedSearch = await getUsePullBasedSearch();
+  const {
+    defaultExcludes,
+    usePullBasedSearch
+  } = await loadPreferences(currentDefaultExcludes);
   const warningHeight = await getSearchWarningMessageHeight(limitHitWarning, width);
   const headerHeight = getSearchHeaderHeight(flags, messageHeight, warningHeight);
   const update = {
@@ -5896,7 +5869,7 @@ const getSearchDisplayResultFile = (results, fileIcons, i, setSize, collapsedPat
   const index = originalResults.indexOf(results[i]);
   const matchCount = getMatchCount(originalResults, index);
   const expanded = collapsedPaths.includes(path) ? Collapsed : Expanded;
-  const badgeText = `${matchCount}`;
+  const badgeText = String(matchCount);
   const depth = 0;
   const indent = getTreeItemIndent(depth);
   return {
@@ -6196,24 +6169,31 @@ const HandleInputSelectionChange = 21;
 const HandleActionClick = 22;
 const HandleOpenFolderClick = 23;
 
+const parentNode = {
+  childCount: 2,
+  className: mergeClassNames(ViewletSearchMessage, ViewletSearchMessageIndented, SearchWorkspaceMessage),
+  type: Div
+};
+const actionNode = {
+  childCount: 1,
+  className: mergeClassNames(MessageAction, SearchWorkspaceMessageAction),
+  onClick: HandleOpenFolderClick,
+  type: Button$2
+};
 const getNoWorkspaceMessageVirtualDom = workspacePath => {
   if (workspacePath !== '') {
     return [];
   }
-  return [{
-    childCount: 2,
-    className: mergeClassNames(ViewletSearchMessage, ViewletSearchMessageIndented, SearchWorkspaceMessage),
-    type: Div
-  }, text(`${noWorkspaceFolder()} - `), {
-    childCount: 1,
-    className: mergeClassNames(MessageAction, SearchWorkspaceMessageAction),
-    onClick: HandleOpenFolderClick,
-    type: Button$2
-  }, text(openFolder$1())];
+  return [parentNode, text(`${noWorkspaceFolder()} - `), actionNode, text(openFolder$1())];
 };
 
 const Focusable = 0;
 
+const iconNode = {
+  childCount: 0,
+  className: mergeClassNames(MaskIcon, MaskIconEllipsis),
+  type: Div
+};
 const getSearchDetailsToggleVirtualDom = () => {
   return [{
     ariaLabel: toggleSearchDetails(),
@@ -6225,11 +6205,7 @@ const getSearchDetailsToggleVirtualDom = () => {
     tabIndex: Focusable,
     title: toggleSearchDetails(),
     type: Button$2
-  }, {
-    childCount: 0,
-    className: mergeClassNames(MaskIcon, MaskIconEllipsis),
-    type: Div
-  }];
+  }, iconNode];
 };
 
 const getSearchMessageClassName = indented => {
@@ -6248,12 +6224,13 @@ const getSearchMessageVirtualDom = (message, indented) => {
   }, text(message)];
 };
 
+const detailsNode$1 = {
+  childCount: 2,
+  className: SearchHeaderDetails,
+  type: Div
+};
 const getSearchHeaderDetailsCollapsedVirtualDom = message => {
-  return [{
-    childCount: 2,
-    className: SearchHeaderDetails,
-    type: Div
-  }, ...getSearchMessageVirtualDom(message, true), ...getSearchDetailsToggleVirtualDom()];
+  return [detailsNode$1, ...getSearchMessageVirtualDom(message, true), ...getSearchDetailsToggleVirtualDom()];
 };
 
 const CheckBoxEnabled = 1;
@@ -6412,28 +6389,27 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
   return dom;
 };
 
+const detailsNode = {
+  childCount: 5,
+  className: SearchHeaderDetailsExpanded,
+  type: Div
+};
+const topNode = {
+  childCount: 2,
+  className: SearchHeaderDetailsExpandedTop,
+  type: Div
+};
+const headingNode = {
+  childCount: 1,
+  className: SearchHeaderDetailsHeading,
+  type: H4
+};
 const getSearchHeaderDetailsExpandedVirtualDom = (flags, message) => {
   const includeButtons = getInputActionsInclude(flags);
   const excludeButtons = getInputActionsExclude(flags);
   const includePlaceholder = include();
   const excludePlaceholder = exclude();
-  return [{
-    childCount: 5,
-    className: SearchHeaderDetailsExpanded,
-    type: Div
-  }, {
-    childCount: 2,
-    className: SearchHeaderDetailsExpandedTop,
-    type: Div
-  }, ...getSearchDetailsToggleVirtualDom(), {
-    childCount: 1,
-    className: SearchHeaderDetailsHeading,
-    type: H4
-  }, text(filesToInclude()), ...getSearchFieldVirtualDom(FilesToInclude, includePlaceholder, HandleInput2, includeButtons.inside, includeButtons.outside), {
-    childCount: 1,
-    className: SearchHeaderDetailsHeading,
-    type: H4
-  }, text(filesToExclude()), ...getSearchFieldVirtualDom(FilesToExclude, excludePlaceholder, HandleInput2, excludeButtons.inside, excludeButtons.outside), ...getSearchMessageVirtualDom(message, false)];
+  return [detailsNode, topNode, ...getSearchDetailsToggleVirtualDom(), headingNode, text(filesToInclude()), ...getSearchFieldVirtualDom(FilesToInclude, includePlaceholder, HandleInput2, includeButtons.inside, includeButtons.outside), headingNode, text(filesToExclude()), ...getSearchFieldVirtualDom(FilesToExclude, excludePlaceholder, HandleInput2, excludeButtons.inside, excludeButtons.outside), ...getSearchMessageVirtualDom(message, false)];
 };
 
 const getSearchHeaderDetailsVirtualDom = (flags, message) => {
@@ -6443,15 +6419,16 @@ const getSearchHeaderDetailsVirtualDom = (flags, message) => {
   return getSearchHeaderDetailsCollapsedVirtualDom(message);
 };
 
+const messageNode = {
+  childCount: 1,
+  className: SearchWarningMessage,
+  type: Div
+};
 const getSearchHeaderLimitHitVirtualDom = limitHitWarning => {
   if (!limitHitWarning) {
     return [];
   }
-  const dom = [{
-    childCount: 1,
-    className: SearchWarningMessage,
-    type: Div
-  },
+  const dom = [messageNode,
   // TODO warning triangle here
   text(limitHitWarning)];
   return dom;
@@ -6517,13 +6494,13 @@ const getSearchEditorContextLinesVirtualDom = (contextLines$1, contextLinesEnabl
   return [{
     ariaLabel: contextLines(),
     childCount: 0,
-    className: `${InputBox} SearchEditorContextLinesInput`,
+    className: mergeClassNames(InputBox, 'SearchEditorContextLinesInput'),
     inputType: 'number',
     min: 0,
     name: ContextLines,
     onInput: HandleInput2,
     type: Input,
-    value: `${contextLines$1}`
+    value: String(contextLines$1)
   }, ...getSearchFieldButtonVirtualDom(button)];
 };
 
@@ -6552,18 +6529,25 @@ const getSearchToggleVirtualDom = replaceExpanded => {
   }];
 };
 
+const headerNode = {
+  childCount: 2,
+  className: SearchHeaderTop,
+  role: None$2,
+  type: Div
+};
+const searchEditorContainerNode = {
+  childCount: 3,
+  className: SearchFieldContainer,
+  role: None$2,
+  type: Div
+};
 const getSearchHeaderTopVirtualDom = (flags, searchInputErrorMessage, matchCount, focus, isSearchEditor = false, contextLines = 1, contextLinesEnabled = false) => {
   const inputActions = getInputActionsInput(flags);
   const replaceActions = getInputActionsReplace(flags, matchCount);
   const searchPlaceholder = getSearchPlaceholder(focus);
   const replacePlaceholder = getReplacePlaceholder(focus);
   const replaceExpanded = flags & ReplaceExpanded;
-  const dom = [{
-    childCount: 2,
-    className: SearchHeaderTop,
-    role: None$2,
-    type: Div
-  }, ...getSearchToggleVirtualDom(replaceExpanded), {
+  const dom = [headerNode, ...getSearchToggleVirtualDom(replaceExpanded), {
     childCount: replaceExpanded ? 2 : 1,
     className: SearchHeaderTopRight,
     role: None$2,
@@ -6571,12 +6555,7 @@ const getSearchHeaderTopVirtualDom = (flags, searchInputErrorMessage, matchCount
   }];
   const searchFieldDom = getSearchFieldVirtualDom(SearchValue, searchPlaceholder, HandleInput2, inputActions.inside, inputActions.outside, Boolean(searchInputErrorMessage));
   if (isSearchEditor) {
-    dom.push({
-      childCount: 3,
-      className: SearchFieldContainer,
-      role: None$2,
-      type: Div
-    }, ...searchFieldDom, ...getSearchEditorContextLinesVirtualDom(contextLines, contextLinesEnabled));
+    dom.push(searchEditorContainerNode, ...searchFieldDom, ...getSearchEditorContextLinesVirtualDom(contextLines, contextLinesEnabled));
   } else {
     dom.push(...searchFieldDom);
   }
@@ -6599,16 +6578,17 @@ const getSearchHeaderVirtualDom = (flags, message, searchInputErrorMessage, matc
   return dom;
 };
 
+const errorNode = {
+  childCount: 1,
+  className: SearchInputError,
+  role: Alert,
+  type: Div
+};
 const getSearchInputErrorVirtualDom = errorMessage => {
   if (!errorMessage) {
     return [];
   }
-  return [{
-    childCount: 1,
-    className: SearchInputError,
-    role: Alert,
-    type: Div
-  }, text(errorMessage)];
+  return [errorNode, text(errorMessage)];
 };
 
 const TreeItems = 'TreeItems';
@@ -6775,7 +6755,7 @@ const getSearchRemoveVirtualDom = () => {
 
 const getSearchResultClassName = focused => {
   if (focused) {
-    return TreeItem + ' ' + TreeItemActive;
+    return mergeClassNames(TreeItem, TreeItemActive);
   }
   return TreeItem;
 };
@@ -7337,8 +7317,8 @@ const handleContextMenu = async (state, button, x, y) => {
   return newState;
 };
 
-const handleDirectMessagePort = (port, setAsRendererProcess) => handleMessagePort(port, commandMap, setAsRendererProcess);
-const commandMap = {
+const handleDirectMessagePort = (port, setAsRendererProcess) => handleMessagePort(port, commandMap$1, setAsRendererProcess);
+const commandMap$1 = {
   'TextSearch.clearSearchResults': wrapCommand(clearSearchResults$1),
   'TextSearch.collapseAll': wrapCommand(collapseAll$1),
   'TextSearch.collapseCurrent': wrapCommand(collapseCurrent),
@@ -7415,8 +7395,6 @@ const commandMap = {
   'TextSearch.handleSharedInput': wrapCommand(handleSharedInput),
   'TextSearch.handleWheel': wrapCommand(handleWheel),
   'TextSearch.handleWorkspaceChange': wrapCommand(handleWorkspaceChange),
-  // not wrapped
-  'TextSearch.initialize': initialize,
   'TextSearch.loadContent': wrapCommand(loadContent),
   'TextSearch.nextHistoryResult': wrapCommand(nextHistoryResult),
   'TextSearch.openSearchEditor': wrapCommand(openSearchEditor),
@@ -7452,28 +7430,68 @@ const commandMap = {
   'TextSearch.viewAsTree': wrapCommand(viewAsTree)
 };
 
-const send = port => {
+const initializeDialogWorker = async () => {
+  const rpc = await create$5({
+    commandMap: {},
+    send: sendMessagePortToDialogWorker
+  });
+  set$7(rpc);
+};
+
+const send$2 = async port => {
+  await sendMessagePortToIconThemeWorker(port, 0);
+};
+const launchIconThemeWorker = async () => {
+  // TODO connect to icon theme worker
+  const rpc = await create$5({
+    commandMap: {},
+    send: send$2
+  });
+  return rpc;
+};
+
+const initializeIconThemeWorker = async () => {
+  const rpc = await launchIconThemeWorker();
+  set$6(rpc);
+};
+
+const send$1 = port => {
   return sendMessagePortToTextMeasurementWorker(port);
 };
 const initializeTextMeasurementWorker = async () => {
   const rpc = await create$5({
     commandMap: {},
-    send
+    send: send$1
   });
   set$2(rpc);
 };
 
+const commandMap = {
+  'TextSearch.handlePullResultsFound': wrapCommand(handlePullResultsFound)
+};
+
+const send = async port => {
+  await sendMessagePortToTextSearchWorker(port, 0);
+};
+const launchTextSearchWorker = async () => {
+  return create$5({
+    commandMap: commandMap,
+    send
+  });
+};
+
+const initializeTextSearchWorker = async () => {
+  const rpc = await launchTextSearchWorker();
+  set$3(rpc);
+};
+
 const listen = async () => {
-  registerCommands(commandMap);
+  registerCommands(commandMap$1);
   const rpc = await create$4({
-    commandMap: commandMap
+    commandMap: commandMap$1
   });
   set$4(rpc);
-  const [dialogRpc] = await Promise.all([create$5({
-    commandMap: {},
-    send: sendMessagePortToDialogWorker
-  }), initializeTextMeasurementWorker()]);
-  set$7(dialogRpc);
+  await Promise.all([initializeDialogWorker(), initializeIconThemeWorker(), initializeTextMeasurementWorker(), initializeTextSearchWorker()]);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/text-search-view",
-  "version": "1.14.3",
+  "version": "1.16.0",
   "description": "Text Search View",
   "keywords": [
     "text-search"