refactor: self code review

src/queries/displayValue.ts

@@ -51,7 +51,7 @@ const getMultipleError = (displayValue: TextMatch) =>
 const getMissingError = (displayValue: TextMatch) =>
   `Unable to find an element with displayValue: ${String(displayValue)}`;
 
-const { getBy, getAllBy, queryBy, findBy, findAllBy } = makeQueries(
+const { getBy, getAllBy, queryBy, queryAllBy, findBy, findAllBy } = makeQueries(
   queryAllByDisplayValue,
   getMissingError,
   getMultipleError
@@ -72,7 +72,7 @@ export const bindByDisplayValueQueries = (
   getByDisplayValue: getBy(instance),
   getAllByDisplayValue: getAllBy(instance),
   queryByDisplayValue: queryBy(instance),
-  queryAllByDisplayValue: queryAllByDisplayValue(instance),
+  queryAllByDisplayValue: queryAllBy(instance),
   findByDisplayValue: findBy(instance),
   findAllByDisplayValue: findAllBy(instance),
 });

src/queries/makeQueries.ts

@@ -35,14 +35,15 @@ export type FindAllByQuery<Predicate, Options> = (
   waitForOptions?: WaitForOptions
 ) => Promise<ReactTestInstance[]>;
 
-type QueryFactor<Query> = (instance: ReactTestInstance) => Query;
-
-export type Queries<Predicate, Options> = {
-  getBy: QueryFactor<GetByQuery<Predicate, Options>>;
-  getAllBy: QueryFactor<GetAllByQuery<Predicate, Options>>;
-  queryBy: QueryFactor<QueryByQuery<Predicate, Options>>;
-  findBy: QueryFactor<FindByQuery<Predicate, Options>>;
-  findAllBy: QueryFactor<FindAllByQuery<Predicate, Options>>;
+type UnboundQuery<Query> = (instance: ReactTestInstance) => Query;
+
+export type UnboundQueries<Predicate, Options> = {
+  getBy: UnboundQuery<GetByQuery<Predicate, Options>>;
+  getAllBy: UnboundQuery<GetAllByQuery<Predicate, Options>>;
+  queryBy: UnboundQuery<QueryByQuery<Predicate, Options>>;
+  queryAllBy: UnboundQuery<QueryAllByQuery<Predicate, Options>>;
+  findBy: UnboundQuery<FindByQuery<Predicate, Options>>;
+  findAllBy: UnboundQuery<FindAllByQuery<Predicate, Options>>;
 };
 
 // The WaitForOptions has been moved to the second option param of findBy* methods with the adding of TextMatchOptions
@@ -76,10 +77,10 @@ Example:
 };
 
 export function makeQueries<Predicate, Options>(
-  queryAllByQuery: QueryFactor<QueryAllByQuery<Predicate, Options>>,
+  queryAllByQuery: UnboundQuery<QueryAllByQuery<Predicate, Options>>,
   getMissingError: (predicate: Predicate) => string,
   getMultipleError: (predicate: Predicate) => string
-): Queries<Predicate, Options> {
+): UnboundQueries<Predicate, Options> {
   function getAllByQuery(instance: ReactTestInstance) {
     return function getAllFn(predicate: Predicate, options?: Options) {
       const results = queryAllByQuery(instance)(predicate, options);
@@ -160,6 +161,7 @@ export function makeQueries<Predicate, Options>(
     getBy: getByQuery,
     getAllBy: getAllByQuery,
     queryBy: queryByQuery,
+    queryAllBy: queryAllByQuery,
     findBy: findByQuery,
     findAllBy: findAllByQuery,
   };

src/queries/placeholderText.ts

@@ -50,7 +50,7 @@ const getMultipleError = (placeholder: TextMatch) =>
 const getMissingError = (placeholder: TextMatch) =>
   `Unable to find an element with placeholder: ${String(placeholder)}`;
 
-const { getBy, getAllBy, queryBy, findBy, findAllBy } = makeQueries(
+const { getBy, getAllBy, queryBy, queryAllBy, findBy, findAllBy } = makeQueries(
   queryAllByPlaceholderText,
   getMissingError,
   getMultipleError
@@ -79,7 +79,7 @@ export const bindByPlaceholderTextQueries = (
   getByPlaceholderText: getBy(instance),
   getAllByPlaceholderText: getAllBy(instance),
   queryByPlaceholderText: queryBy(instance),
-  queryAllByPlaceholderText: queryAllByPlaceholderText(instance),
+  queryAllByPlaceholderText: queryAllBy(instance),
   findByPlaceholderText: findBy(instance),
   findAllByPlaceholderText: findAllBy(instance),
 

src/queries/testId.ts

@@ -39,7 +39,7 @@ const getMultipleError = (testId: TextMatch) =>
 const getMissingError = (testId: TextMatch) =>
   `Unable to find an element with testID: ${String(testId)}`;
 
-const { getBy, getAllBy, queryBy, findBy, findAllBy } = makeQueries(
+const { getBy, getAllBy, queryBy, queryAllBy, findBy, findAllBy } = makeQueries(
   queryAllByTestId,
   getMissingError,
   getMultipleError
@@ -60,7 +60,7 @@ export const bindByTestIdQueries = (
   getByTestId: getBy(instance),
   getAllByTestId: getAllBy(instance),
   queryByTestId: queryBy(instance),
-  queryAllByTestId: queryAllByTestId(instance),
+  queryAllByTestId: queryAllBy(instance),
   findByTestId: findBy(instance),
   findAllByTestId: findAllBy(instance),
 });

src/queries/text.ts

@@ -96,7 +96,7 @@ const getMultipleError = (text: TextMatch) =>
 const getMissingError = (text: TextMatch) =>
   `Unable to find an element with text: ${String(text)}`;
 
-const { getBy, getAllBy, queryBy, findBy, findAllBy } = makeQueries(
+const { getBy, getAllBy, queryBy, queryAllBy, findBy, findAllBy } = makeQueries(
   queryAllByText,
   getMissingError,
   getMultipleError
@@ -117,7 +117,7 @@ export const bindByTextQueries = (
   getByText: getBy(instance),
   getAllByText: getAllBy(instance),
   queryByText: queryBy(instance),
-  queryAllByText: queryAllByText(instance),
+  queryAllByText: queryAllBy(instance),
   findByText: findBy(instance),
   findAllByText: findAllBy(instance),
 });