32 problems left

Author: mdjastrzebski

src/__tests__/__snapshots__/render-debug.test.tsx.snap

@@ -288,6 +288,7 @@ exports[`debug with only props from TextInput components 1`] = `
 exports[`debug: another custom message 1`] = `
 "another custom message
 
+
 <View>
   <Text>
     Is the banana fresh?
@@ -370,6 +371,7 @@ exports[`debug: another custom message 1`] = `
 exports[`debug: with message 1`] = `
 "my custom message
 
+
 <View>
   <Text>
     Is the banana fresh?

src/__tests__/render-debug.test.tsx

@@ -98,9 +98,9 @@ test('debug', () => {
   screen.debug({ message: 'another custom message' });
 
   const mockCalls = jest.mocked(logger.info).mock.calls;
-  expect(stripAnsi(mockCalls[0][0])).toMatchSnapshot();
-  expect(stripAnsi(mockCalls[1][0] + mockCalls[1][1])).toMatchSnapshot('with message');
-  expect(stripAnsi(mockCalls[2][0] + mockCalls[2][1])).toMatchSnapshot('another custom message');
+  expect(mockCalls[0][0]).toMatchSnapshot();
+  expect(`${mockCalls[1][0]}\n${mockCalls[1][1]}`).toMatchSnapshot('with message');
+  expect(`${mockCalls[2][0]}\n${mockCalls[2][1]}`).toMatchSnapshot('another custom message');
 
   const mockWarnCalls = jest.mocked(logger.warn).mock.calls;
   expect(mockWarnCalls[0]).toMatchInlineSnapshot(`
@@ -117,17 +117,15 @@ test('debug changing component', () => {
   screen.debug();
 
   const mockCalls = jest.mocked(logger.info).mock.calls;
-  expect(stripAnsi(mockCalls[0][0])).toMatchSnapshot(
-    'bananaFresh button message should now be "fresh"',
-  );
+  expect(mockCalls[0][0]).toMatchSnapshot('bananaFresh button message should now be "fresh"');
 });
 
 test('debug with only children prop', () => {
   render(<Banana />);
   screen.debug({ mapProps: () => ({}) });
 
   const mockCalls = jest.mocked(logger.info).mock.calls;
-  expect(stripAnsi(mockCalls[0][0])).toMatchSnapshot();
+  expect(mockCalls[0][0]).toMatchSnapshot();
 });
 
 test('debug with only prop whose value is bananaChef', () => {
@@ -145,7 +143,7 @@ test('debug with only prop whose value is bananaChef', () => {
   });
 
   const mockCalls = jest.mocked(logger.info).mock.calls;
-  expect(stripAnsi(mockCalls[0][0])).toMatchSnapshot();
+  expect(mockCalls[0][0]).toMatchSnapshot();
 });
 
 test('debug with only props from TextInput components', () => {
@@ -155,7 +153,7 @@ test('debug with only props from TextInput components', () => {
   });
 
   const mockCalls = jest.mocked(logger.info).mock.calls;
-  expect(stripAnsi(mockCalls[0][0])).toMatchSnapshot();
+  expect(mockCalls[0][0]).toMatchSnapshot();
 });
 
 test('debug should use debugOptions from config when no option is specified', () => {
@@ -169,7 +167,7 @@ test('debug should use debugOptions from config when no option is specified', ()
   screen.debug();
 
   const mockCalls = jest.mocked(logger.info).mock.calls;
-  expect(stripAnsi(mockCalls[0][0])).toMatchSnapshot();
+  expect(mockCalls[0][0]).toMatchSnapshot();
 });
 
 test('filtering out props through mapProps option should not modify component', () => {
@@ -190,5 +188,5 @@ test('debug should use given options over config debugOptions', () => {
   screen.debug({ mapProps: (props) => props });
 
   const mockCalls = jest.mocked(logger.info).mock.calls;
-  expect(stripAnsi(mockCalls[0][0])).toMatchSnapshot();
+  expect(mockCalls[0][0]).toMatchSnapshot();
 });

src/helpers/logger.ts

@@ -4,28 +4,28 @@ import chalk from 'chalk';
 import redent from 'redent';
 
 export const logger = {
-  debug(message: any, ...args: any[]) {
+  debug(message: unknown, ...args: unknown[]) {
     const output = formatMessage('●', message, ...args);
     nodeConsole.debug(chalk.dim(output));
   },
 
-  info(message: any, ...args: any[]) {
+  info(message: unknown, ...args: unknown[]) {
     const output = formatMessage('●', message, ...args);
     nodeConsole.info(output);
   },
 
-  warn(message: any, ...args: any[]) {
+  warn(message: unknown, ...args: unknown[]) {
     const output = formatMessage('▲', message, ...args);
     nodeConsole.warn(chalk.yellow(output));
   },
 
-  error(message: any, ...args: any[]) {
+  error(message: unknown, ...args: unknown[]) {
     const output = formatMessage('■', message, ...args);
     nodeConsole.error(chalk.red(output));
   },
 };
 
-function formatMessage(symbol: string, message: any, ...args: any[]) {
+function formatMessage(symbol: string, message: unknown, ...args: unknown[]) {
   const formatted = nodeUtil.format(message, ...args);
   const indented = redent(formatted, 4);
   return `  ${symbol} ${indented.trimStart()}\n`;

src/queries/unsafe-props.ts

@@ -3,10 +3,12 @@ import prettyFormat from 'pretty-format';
 import { ErrorWithStack, prepareErrorMessage } from '../helpers/errors';
 import { createQueryByError } from '../helpers/errors';
 
+export type UnsafeProps = Record<string, unknown>;
+
 const UNSAFE_getByProps = (
   instance: ReactTestInstance,
-): ((props: { [propName: string]: any }) => ReactTestInstance) =>
-  function getByPropsFn(props: { [propName: string]: any }) {
+): ((props: UnsafeProps) => ReactTestInstance) =>
+  function getByPropsFn(props: UnsafeProps) {
     try {
       return instance.findByProps(props);
     } catch (error) {
@@ -16,8 +18,8 @@ const UNSAFE_getByProps = (
 
 const UNSAFE_getAllByProps = (
   instance: ReactTestInstance,
-): ((props: { [propName: string]: any }) => Array<ReactTestInstance>) =>
-  function getAllByPropsFn(props: { [propName: string]: any }) {
+): ((props: UnsafeProps) => Array<ReactTestInstance>) =>
+  function getAllByPropsFn(props: UnsafeProps) {
     const results = instance.findAllByProps(props);
     if (results.length === 0) {
       throw new ErrorWithStack(
@@ -30,8 +32,8 @@ const UNSAFE_getAllByProps = (
 
 const UNSAFE_queryByProps = (
   instance: ReactTestInstance,
-): ((props: { [propName: string]: any }) => ReactTestInstance | null) =>
-  function queryByPropsFn(props: { [propName: string]: any }) {
+): ((props: UnsafeProps) => ReactTestInstance | null) =>
+  function queryByPropsFn(props: UnsafeProps) {
     try {
       return UNSAFE_getByProps(instance)(props);
     } catch (error) {
@@ -40,10 +42,8 @@ const UNSAFE_queryByProps = (
   };
 
 const UNSAFE_queryAllByProps =
-  (
-    instance: ReactTestInstance,
-  ): ((props: { [propName: string]: any }) => Array<ReactTestInstance>) =>
-  (props: { [propName: string]: any }) => {
+  (instance: ReactTestInstance): ((props: UnsafeProps) => Array<ReactTestInstance>) =>
+  (props: UnsafeProps) => {
     try {
       return UNSAFE_getAllByProps(instance)(props);
     } catch {
@@ -53,10 +53,10 @@ const UNSAFE_queryAllByProps =
 
 // Unsafe aliases
 export type UnsafeByPropsQueries = {
-  UNSAFE_getByProps: (props: { [key: string]: any }) => ReactTestInstance;
-  UNSAFE_getAllByProps: (props: { [key: string]: any }) => Array<ReactTestInstance>;
-  UNSAFE_queryByProps: (props: { [key: string]: any }) => ReactTestInstance | null;
-  UNSAFE_queryAllByProps: (props: { [key: string]: any }) => Array<ReactTestInstance>;
+  UNSAFE_getByProps: (props: UnsafeProps) => ReactTestInstance;
+  UNSAFE_getAllByProps: (props: UnsafeProps) => Array<ReactTestInstance>;
+  UNSAFE_queryByProps: (props: UnsafeProps) => ReactTestInstance | null;
+  UNSAFE_queryAllByProps: (props: UnsafeProps) => Array<ReactTestInstance>;
 };
 
 // TODO: migrate to makeQueries pattern

src/queries/unsafe-type.ts

@@ -3,10 +3,13 @@ import * as React from 'react';
 import { ErrorWithStack, prepareErrorMessage } from '../helpers/errors';
 import { createQueryByError } from '../helpers/errors';
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type UnsafeComponentType = React.ComponentType<any>;
+
 const UNSAFE_getByType = (
   instance: ReactTestInstance,
-): ((type: React.ComponentType<any>) => ReactTestInstance) =>
-  function getByTypeFn(type: React.ComponentType<any>) {
+): ((type: UnsafeComponentType) => ReactTestInstance) =>
+  function getByTypeFn(type: UnsafeComponentType) {
     try {
       return instance.findByType(type);
     } catch (error) {
@@ -16,8 +19,8 @@ const UNSAFE_getByType = (
 
 const UNSAFE_getAllByType = (
   instance: ReactTestInstance,
-): ((type: React.ComponentType<any>) => Array<ReactTestInstance>) =>
-  function getAllByTypeFn(type: React.ComponentType<any>) {
+): ((type: UnsafeComponentType) => Array<ReactTestInstance>) =>
+  function getAllByTypeFn(type: UnsafeComponentType) {
     const results = instance.findAllByType(type);
     if (results.length === 0) {
       throw new ErrorWithStack('No instances found', getAllByTypeFn);
@@ -27,8 +30,8 @@ const UNSAFE_getAllByType = (
 
 const UNSAFE_queryByType = (
   instance: ReactTestInstance,
-): ((type: React.ComponentType<any>) => ReactTestInstance | null) =>
-  function queryByTypeFn(type: React.ComponentType<any>) {
+): ((type: UnsafeComponentType) => ReactTestInstance | null) =>
+  function queryByTypeFn(type: UnsafeComponentType) {
     try {
       return UNSAFE_getByType(instance)(type);
     } catch (error) {
@@ -37,8 +40,8 @@ const UNSAFE_queryByType = (
   };
 
 const UNSAFE_queryAllByType =
-  (instance: ReactTestInstance): ((type: React.ComponentType<any>) => Array<ReactTestInstance>) =>
-  (type: React.ComponentType<any>) => {
+  (instance: ReactTestInstance): ((type: UnsafeComponentType) => Array<ReactTestInstance>) =>
+  (type: UnsafeComponentType) => {
     try {
       return UNSAFE_getAllByType(instance)(type);
     } catch {