Add queryOptions to labelText and hintText

Author: ShaswatPrabhat

src/queries/hintText.ts

@@ -1,6 +1,5 @@
 import type { ReactTestInstance } from 'react-test-renderer';
-import { TextMatch } from '../matches';
-import { matchStringProp } from '../helpers/matchers/matchStringProp';
+import { matches, TextMatch } from '../matches';
 import { makeQueries } from './makeQueries';
 import type {
   FindAllByQuery,
@@ -10,16 +9,27 @@ import type {
   QueryAllByQuery,
   QueryByQuery,
 } from './makeQueries';
+import { TextMatchOptions } from './text';
+
+const getNodeByHintText = (
+  node: ReactTestInstance,
+  text: TextMatch,
+  options: TextMatchOptions = {}
+) => {
+  const { exact, normalizer } = options;
+  return matches(text, node.props.accessibilityHint, normalizer, exact);
+};
 
 const queryAllByHintText = (
   instance: ReactTestInstance
-): ((hint: TextMatch) => Array<ReactTestInstance>) =>
-  function queryAllByA11yHintFn(hint) {
-    return instance.findAll(
-      (node) =>
-        typeof node.type === 'string' &&
-        matchStringProp(node.props.accessibilityHint, hint)
-    );
+): ((
+  hint: TextMatch,
+  queryOptions?: TextMatchOptions
+) => Array<ReactTestInstance>) =>
+  function queryAllByA11yHintFn(hint, queryOptions) {
+    return instance
+      .findAll((node) => getNodeByHintText(node, hint, queryOptions))
+      .filter((element) => typeof element.type === 'string');
   };
 
 const getMultipleError = (hint: TextMatch) =>
@@ -34,28 +44,28 @@ const { getBy, getAllBy, queryBy, queryAllBy, findBy, findAllBy } = makeQueries(
 );
 
 export type ByHintTextQueries = {
-  getByHintText: GetByQuery<TextMatch>;
-  getAllByHintText: GetAllByQuery<TextMatch>;
-  queryByHintText: QueryByQuery<TextMatch>;
-  queryAllByHintText: QueryAllByQuery<TextMatch>;
-  findByHintText: FindByQuery<TextMatch>;
-  findAllByHintText: FindAllByQuery<TextMatch>;
+  getByHintText: GetByQuery<TextMatch, TextMatchOptions>;
+  getAllByHintText: GetAllByQuery<TextMatch, TextMatchOptions>;
+  queryByHintText: QueryByQuery<TextMatch, TextMatchOptions>;
+  queryAllByHintText: QueryAllByQuery<TextMatch, TextMatchOptions>;
+  findByHintText: FindByQuery<TextMatch, TextMatchOptions>;
+  findAllByHintText: FindAllByQuery<TextMatch, TextMatchOptions>;
 
   // a11yHint aliases
-  getByA11yHint: GetByQuery<TextMatch>;
-  getAllByA11yHint: GetAllByQuery<TextMatch>;
-  queryByA11yHint: QueryByQuery<TextMatch>;
-  queryAllByA11yHint: QueryAllByQuery<TextMatch>;
-  findByA11yHint: FindByQuery<TextMatch>;
-  findAllByA11yHint: FindAllByQuery<TextMatch>;
+  getByA11yHint: GetByQuery<TextMatch, TextMatchOptions>;
+  getAllByA11yHint: GetAllByQuery<TextMatch, TextMatchOptions>;
+  queryByA11yHint: QueryByQuery<TextMatch, TextMatchOptions>;
+  queryAllByA11yHint: QueryAllByQuery<TextMatch, TextMatchOptions>;
+  findByA11yHint: FindByQuery<TextMatch, TextMatchOptions>;
+  findAllByA11yHint: FindAllByQuery<TextMatch, TextMatchOptions>;
 
   // accessibilityHint aliases
-  getByAccessibilityHint: GetByQuery<TextMatch>;
-  getAllByAccessibilityHint: GetAllByQuery<TextMatch>;
-  queryByAccessibilityHint: QueryByQuery<TextMatch>;
-  queryAllByAccessibilityHint: QueryAllByQuery<TextMatch>;
-  findByAccessibilityHint: FindByQuery<TextMatch>;
-  findAllByAccessibilityHint: FindAllByQuery<TextMatch>;
+  getByAccessibilityHint: GetByQuery<TextMatch, TextMatchOptions>;
+  getAllByAccessibilityHint: GetAllByQuery<TextMatch, TextMatchOptions>;
+  queryByAccessibilityHint: QueryByQuery<TextMatch, TextMatchOptions>;
+  queryAllByAccessibilityHint: QueryAllByQuery<TextMatch, TextMatchOptions>;
+  findByAccessibilityHint: FindByQuery<TextMatch, TextMatchOptions>;
+  findAllByAccessibilityHint: FindAllByQuery<TextMatch, TextMatchOptions>;
 };
 
 export const bindByHintTextQueries = (

src/queries/labelText.ts

@@ -1,6 +1,5 @@
 import type { ReactTestInstance } from 'react-test-renderer';
-import { TextMatch } from '../matches';
-import { matchStringProp } from '../helpers/matchers/matchStringProp';
+import { matches, TextMatch } from '../matches';
 import { makeQueries } from './makeQueries';
 import type {
   FindAllByQuery,
@@ -10,15 +9,28 @@ import type {
   QueryAllByQuery,
   QueryByQuery,
 } from './makeQueries';
+import { TextMatchOptions } from './text';
+
+const getNodeByLabelText = (
+  node: ReactTestInstance,
+  text: TextMatch,
+  options: TextMatchOptions = {}
+) => {
+  const { exact, normalizer } = options;
+  return matches(text, node.props.accessibilityLabel, normalizer, exact);
+};
 
 const queryAllByLabelText = (
   instance: ReactTestInstance
-): ((text: TextMatch) => Array<ReactTestInstance>) =>
-  function queryAllByLabelTextFn(text) {
+): ((
+  text: TextMatch,
+  queryOptions?: TextMatchOptions
+) => Array<ReactTestInstance>) =>
+  function queryAllByLabelTextFn(text, queryOptions?: TextMatchOptions) {
     return instance.findAll(
       (node) =>
         typeof node.type === 'string' &&
-        matchStringProp(node.props.accessibilityLabel, text)
+        getNodeByLabelText(node, text, queryOptions)
     );
   };
 
@@ -34,12 +46,12 @@ const { getBy, getAllBy, queryBy, queryAllBy, findBy, findAllBy } = makeQueries(
 );
 
 export type ByLabelTextQueries = {
-  getByLabelText: GetByQuery<TextMatch>;
-  getAllByLabelText: GetAllByQuery<TextMatch>;
-  queryByLabelText: QueryByQuery<TextMatch>;
-  queryAllByLabelText: QueryAllByQuery<TextMatch>;
-  findByLabelText: FindByQuery<TextMatch>;
-  findAllByLabelText: FindAllByQuery<TextMatch>;
+  getByLabelText: GetByQuery<TextMatch, TextMatchOptions>;
+  getAllByLabelText: GetAllByQuery<TextMatch, TextMatchOptions>;
+  queryByLabelText: QueryByQuery<TextMatch, TextMatchOptions>;
+  queryAllByLabelText: QueryAllByQuery<TextMatch, TextMatchOptions>;
+  findByLabelText: FindByQuery<TextMatch, TextMatchOptions>;
+  findAllByLabelText: FindAllByQuery<TextMatch, TextMatchOptions>;
 };
 
 export const bindByLabelTextQueries = (