fix: apply review suggestions

Author: marcosvega91

src/config.ts

@@ -1,15 +1,15 @@
 import {Config, ConfigFn} from '../types/config'
-import {Callback} from '../types/utils'
 import {prettyDOM} from './pretty-dom'
 
-interface InternalConfig {
+type Callback<T> = () => T
+interface InternalConfig extends Config {
   _disableExpensiveErrorDiagnostics: boolean
 }
 
 // It would be cleaner for this to live inside './queries', but
 // other parts of the code assume that all exports from
 // './queries' are query functions.
-let config: Config & InternalConfig = {
+let config: InternalConfig = {
   testIdAttribute: 'data-testid',
   asyncUtilTimeout: 1000,
   // this is to support React's async `act` function.

src/label-helpers.ts

@@ -1,4 +1,3 @@
-import {isNotNull} from './utils'
 import {TEXT_NODE} from './helpers'
 
 const labelledNodeNames = [
@@ -25,21 +24,20 @@ function getTextContent(
     .join('')
 }
 
-function getLabelContent(node: Node | Element | HTMLInputElement) {
+function getLabelContent(element: Element | HTMLInputElement) {
   let textContent
-  if ('tagName' in node && node.tagName.toLowerCase() === 'label') {
-    textContent = getTextContent(node)
-  } else if ('value' in node) {
-    textContent = node.value
+  if (element.tagName.toLowerCase() === 'label') {
+    textContent = getTextContent(element)
+  } else if ('value' in element) {
+    return element.value
   } else {
-    textContent = node.textContent
+    textContent = element.textContent
   }
   return textContent
 }
 
 // Based on https://github.com/eps1lon/dom-accessibility-api/pull/352
 function getRealLabels(element: Element | HTMLInputElement) {
-  // for old browsers
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   if ('labels' in element && element.labels !== undefined)
     return element.labels ?? []
@@ -64,7 +62,7 @@ function getLabels(
   {selector = '*'} = {},
 ) {
   const ariaLabelledBy = element.getAttribute('aria-labelledby')
-  const labelsId = isNotNull(ariaLabelledBy) ? ariaLabelledBy.split(' ') : []
+  const labelsId = ariaLabelledBy ? ariaLabelledBy.split(' ') : []
   return labelsId.length
     ? labelsId.map(labelId => {
         const labellingElement = container.querySelector(`[id="${labelId}"]`)

src/matches.ts

@@ -4,7 +4,8 @@ import {
   NormalizerOptions,
   DefaultNormalizerOptions,
 } from '../types'
-import {Nullish} from '../types/utils'
+
+type Nullish<T> = T | null | undefined
 
 function assertNotNullOrUndefined<T>(
   matcher: T,

src/utils.ts

@@ -3,8 +3,6 @@ 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,8 +3,6 @@ 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,5 +1,6 @@
 import {ARIARole} from 'aria-query'
-import {Nullish} from './utils'
+
+type Nullish<T> = T | null | undefined
 
 export type MatcherFunction = (
   content: string,
@@ -13,7 +14,7 @@ export type ByRoleMatcher = ARIARole | MatcherFunction | {}
 
 export type NormalizerFn = (text: string) => string
 
-export type NormalizerOptions = DefaultNormalizerOptions & {
+export interface NormalizerOptions extends DefaultNormalizerOptions {
   normalizer?: NormalizerFn
 }