chore: use types from old folder

Author: marcosvega91

src/config.ts

@@ -1,23 +1,6 @@
+import {Config, ConfigFn} from '../types/config'
+import {Callback} from '../types/utils'
 import {prettyDOM} from './pretty-dom'
-import {Callback} from './types'
-
-export interface Config {
-  testIdAttribute: string
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  asyncWrapper(cb: (...args: any[]) => any): Promise<any>
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  eventWrapper(cb: (...args: any[]) => any): void
-  asyncUtilTimeout: number
-  computedStyleSupportsPseudoElements: boolean
-  defaultHidden: boolean
-  showOriginalStackTrace: boolean
-  throwSuggestions: boolean
-  getElementError: (message: string | null, container: Element) => Error
-}
-
-export interface ConfigFn {
-  (existingConfig: Config): Partial<Config>
-}
 
 interface InternalConfig {
   _disableExpensiveErrorDiagnostics: boolean

src/matches.ts

@@ -1,36 +1,10 @@
-import {ARIARole} from 'aria-query'
-import {Nullish} from './types'
-
-export type ByRoleMatcher = ARIARole | MatcherFunction | {}
-
-export type Matcher = MatcherFunction | RegExp | string
-
-export type MatcherFunction = (
-  content: string,
-  element: Nullish<Element>,
-) => boolean
-
-export type NormalizerFn = (text: string) => string
-
-export interface DefaultNormalizerOptions {
-  trim?: boolean
-  collapseWhitespace?: boolean
-}
-
-export interface MatcherOptions {
-  exact?: boolean
-  /** Use normalizer with getDefaultNormalizer instead */
-  trim?: boolean
-  /** Use normalizer with getDefaultNormalizer instead */
-  collapseWhitespace?: boolean
-  normalizer?: NormalizerFn
-  /** suppress suggestions for a specific query */
-  suggest?: boolean
-}
-
-export type NormalizerOptions = DefaultNormalizerOptions & {
-  normalizer?: NormalizerFn
-}
+import {
+  Matcher,
+  NormalizerFn,
+  NormalizerOptions,
+  DefaultNormalizerOptions,
+} from '../types'
+import {Nullish} from '../types/utils'
 
 function assertNotNullOrUndefined<T>(
   matcher: T,

src/types.ts

@@ -3,6 +3,8 @@ const baseConfig = require('kcd-scripts/jest')
 
 module.exports = {
   ...baseConfig,
+  moduleFileExtensions: [...baseConfig.moduleFileExtensions, 'd.ts'],
+  moduleDirectories: [...baseConfig.moduleDirectories, 'types'],
   rootDir: path.join(__dirname, '..'),
   displayName: 'dom',
   coveragePathIgnorePatterns: [

tests/jest.config.dom.js

@@ -3,6 +3,8 @@ const baseConfig = require('kcd-scripts/jest')
 
 module.exports = {
   ...baseConfig,
+  moduleFileExtensions: [...baseConfig.moduleFileExtensions, 'd.ts'],
+  moduleDirectories: [...baseConfig.moduleDirectories, 'types'],
   rootDir: path.join(__dirname, '..'),
   displayName: 'node',
   testEnvironment: 'jest-environment-node',

tests/jest.config.node.js

@@ -1,13 +1,15 @@
 export interface Config {
   testIdAttribute: string
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   asyncWrapper(cb: (...args: any[]) => any): Promise<any>
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   eventWrapper(cb: (...args: any[]) => any): void
   asyncUtilTimeout: number
   computedStyleSupportsPseudoElements: boolean
   defaultHidden: boolean
   showOriginalStackTrace: boolean
   throwSuggestions: boolean
-  getElementError: (message: string, container: HTMLElement) => Error
+  getElementError: (message: string | null, container: Element) => Error
 }
 
 export interface ConfigFn {

types/config.d.ts

@@ -1,14 +1,22 @@
 import {ARIARole} from 'aria-query'
+import {Nullish} from './utils'
 
-export type MatcherFunction = (content: string, element: HTMLElement) => boolean
-export type Matcher = MatcherFunction | {}
+export type MatcherFunction = (
+  content: string,
+  element: Nullish<Element>,
+) => boolean
+export type Matcher = MatcherFunction | RegExp | string
 
 // Get autocomplete for ARIARole union types, while still supporting another string
 // Ref: https://github.com/microsoft/TypeScript/issues/29729#issuecomment-505826972
 export type ByRoleMatcher = ARIARole | MatcherFunction | {}
 
 export type NormalizerFn = (text: string) => string
 
+export type NormalizerOptions = DefaultNormalizerOptions & {
+  normalizer?: NormalizerFn
+}
+
 export interface MatcherOptions {
   exact?: boolean
   /** Use normalizer with getDefaultNormalizer instead */

types/matches.d.ts

@@ -0,0 +1,7 @@
+export type Nullish<T> = T | null | undefined
+
+export type Callback<T> = () => T
+
+export function isNotNull<T>(arg: T): arg is NonNullable<T> {
+  return arg !== null
+}