Polish types

package.json

@@ -57,7 +57,10 @@
     "typescript": "^4.1.2"
   },
   "eslintConfig": {
-    "extends": "./node_modules/kcd-scripts/eslint.js",
+    "extends": [
+      "./node_modules/kcd-scripts/eslint.js",
+      "plugin:import/typescript"
+    ],
     "rules": {
       "import/prefer-default-export": "off",
       "import/no-unassigned-import": "off",

src/__tests__/config.js

@@ -1,4 +1,4 @@
-import {configure, getConfig} from '../config.ts'
+import {configure, getConfig} from '../config'
 
 describe('configuration API', () => {
   let originalConfig

src/__tests__/element-queries.js

@@ -1,4 +1,4 @@
-import {configure} from '../config.ts'
+import {configure} from '../config'
 import {render, renderIntoDocument} from './helpers/test-utils'
 
 beforeEach(() => {

src/__tests__/get-by-errors.js

@@ -1,6 +1,6 @@
 import cases from 'jest-in-case'
 import {screen} from '../'
-import {configure, getConfig} from '../config.ts'
+import {configure, getConfig} from '../config'
 import {render} from './helpers/test-utils'
 
 const originalConfig = getConfig()

src/__tests__/label-helpers.js

@@ -1,4 +1,4 @@
-import {getRealLabels} from '../label-helpers.ts'
+import {getRealLabels} from '../label-helpers'
 
 test('hidden inputs are not labelable', () => {
   const element = document.createElement('input')

src/__tests__/matches.js

@@ -1,4 +1,4 @@
-import {fuzzyMatches, matches} from '../matches.ts'
+import {fuzzyMatches, matches} from '../matches'
 
 // unit tests for text match utils
 

src/__tests__/query-helper.js

@@ -1,5 +1,5 @@
 import * as queryHelpers from '../query-helpers'
-import {configure, getConfig} from '../config.ts'
+import {configure, getConfig} from '../config'
 
 const originalConfig = getConfig()
 beforeEach(() => {

src/__tests__/role.js

@@ -1,4 +1,4 @@
-import {configure, getConfig} from '../config.ts'
+import {configure, getConfig} from '../config'
 import {getQueriesForElement} from '../get-queries-for-element'
 import {render, renderIntoDocument} from './helpers/test-utils'
 

src/__tests__/suggestions.js

@@ -1,4 +1,4 @@
-import {configure} from '../config.ts'
+import {configure} from '../config'
 import {screen, getSuggestedQuery} from '..'
 import {renderIntoDocument, render} from './helpers/test-utils'
 

src/__tests__/wait-for.js

@@ -1,5 +1,5 @@
 import {waitFor} from '../'
-import {configure, getConfig} from '../config.ts'
+import {configure, getConfig} from '../config'
 import {renderIntoDocument} from './helpers/test-utils'
 
 function deferred() {

src/events.js

@@ -1,4 +1,4 @@
-import {getConfig} from './config.ts'
+import {getConfig} from './config'
 import {getWindowFromNode} from './helpers'
 import {eventMap, eventAliasMap} from './event-map'
 

src/index.js

@@ -7,15 +7,15 @@ export * from './wait-for'
 export * from './wait-for-element'
 export * from './wait-for-element-to-be-removed'
 export * from './wait-for-dom-change'
-export {getDefaultNormalizer} from './matches.ts'
+export {getDefaultNormalizer} from './matches'
 export * from './get-node-text'
 export * from './events'
 export * from './get-queries-for-element'
 export * from './screen'
 export * from './query-helpers'
 export {getRoles, logRoles, isInaccessible} from './role-helpers'
 export * from './pretty-dom'
-export {configure, getConfig} from './config.ts'
+export {configure, getConfig} from './config'
 export * from './suggestions'
 
 export {

src/label-helpers.ts

@@ -24,23 +24,22 @@ function getTextContent(
     .join('')
 }
 
-function getLabelContent(element: Element | HTMLInputElement) {
-  let textContent
+function getLabelContent(element: Element): string | null {
+  let textContent: string | null
   if (element.tagName.toLowerCase() === 'label') {
     textContent = getTextContent(element)
-  } else if ('value' in element) {
-    return element.value
   } else {
-    textContent = element.textContent
+    textContent = (element as HTMLInputElement).value || element.textContent
   }
   return textContent
 }
 
 // Based on https://github.com/eps1lon/dom-accessibility-api/pull/352
-function getRealLabels(element: Element | HTMLInputElement) {
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-  if ('labels' in element && element.labels !== undefined)
-    return element.labels ?? []
+function getRealLabels(element: Element) {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- types are not aware of older browsers that don't implement `labels`
+  if ((element as HTMLInputElement).labels !== undefined) {
+    return (element as HTMLInputElement).labels ?? []
+  }
 
   if (!isLabelable(element)) return []
 
@@ -49,9 +48,8 @@ function getRealLabels(element: Element | HTMLInputElement) {
 }
 
 function isLabelable(element: Element) {
-  const labelableRegex = /BUTTON|METER|OUTPUT|PROGRESS|SELECT|TEXTAREA/
   return (
-    labelableRegex.test(element.tagName) ||
+    /BUTTON|METER|OUTPUT|PROGRESS|SELECT|TEXTAREA/.test(element.tagName) ||
     (element.tagName === 'INPUT' && element.getAttribute('type') !== 'hidden')
   )
 }

src/matches.ts

@@ -12,7 +12,7 @@ function assertNotNullOrUndefined<T>(
 ): asserts matcher is NonNullable<T> {
   if (matcher === null || matcher === undefined) {
     throw new Error(
-      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions -- implicitly converting `T` to `string`
       `It looks like ${matcher} was passed instead of a matcher. Did you do something like getByText(${matcher})?`,
     )
   }

src/queries/all-utils.js

@@ -1,4 +1,4 @@
-export * from '../matches.ts'
+export * from '../matches'
 export * from '../get-node-text'
 export * from '../query-helpers'
-export * from '../config.ts'
+export * from '../config'

src/queries/label-text.js

@@ -1,6 +1,6 @@
-import {getConfig} from '../config.ts'
+import {getConfig} from '../config'
 import {checkContainerType} from '../helpers'
-import {getLabels, getRealLabels, getLabelContent} from '../label-helpers.ts'
+import {getLabels, getRealLabels, getLabelContent} from '../label-helpers'
 import {
   fuzzyMatches,
   matches,

src/queries/text.js

@@ -1,6 +1,6 @@
 import {wrapAllByQueryWithSuggestion} from '../query-helpers'
 import {checkContainerType} from '../helpers'
-import {DEFAULT_IGNORE_TAGS} from '../config.ts'
+import {DEFAULT_IGNORE_TAGS} from '../config'
 import {
   fuzzyMatches,
   matches,

src/query-helpers.js

@@ -1,7 +1,7 @@
 import {getSuggestedQuery} from './suggestions'
-import {fuzzyMatches, matches, makeNormalizer} from './matches.ts'
+import {fuzzyMatches, matches, makeNormalizer} from './matches'
 import {waitFor} from './wait-for'
-import {getConfig} from './config.ts'
+import {getConfig} from './config'
 
 function getElementError(message, container) {
   return getConfig().getElementError(message, container)

src/role-helpers.js

@@ -1,7 +1,7 @@
 import {elementRoles} from 'aria-query'
 import {computeAccessibleName} from 'dom-accessibility-api'
 import {prettyDOM} from './pretty-dom'
-import {getConfig} from './config.ts'
+import {getConfig} from './config'
 
 const elementRoleList = buildElementRoleList(elementRoles)
 

src/suggestions.js

@@ -1,9 +1,9 @@
 import {computeAccessibleName} from 'dom-accessibility-api'
-import {getDefaultNormalizer} from './matches.ts'
+import {getDefaultNormalizer} from './matches'
 import {getNodeText} from './get-node-text'
-import {DEFAULT_IGNORE_TAGS, getConfig} from './config.ts'
+import {DEFAULT_IGNORE_TAGS, getConfig} from './config'
 import {getImplicitAriaRoles, isInaccessible} from './role-helpers'
-import {getLabels} from './label-helpers.ts'
+import {getLabels} from './label-helpers'
 
 const normalize = getDefaultNormalizer()
 

src/wait-for-dom-change.js

@@ -6,7 +6,7 @@ import {
   clearTimeout,
   runWithRealTimers,
 } from './helpers'
-import {getConfig} from './config.ts'
+import {getConfig} from './config'
 
 let hasWarned = false
 

src/wait-for.js

@@ -9,7 +9,7 @@ import {
   setTimeout,
   clearTimeout,
 } from './helpers'
-import {getConfig, runWithExpensiveErrorDiagnosticsDisabled} from './config.ts'
+import {getConfig, runWithExpensiveErrorDiagnosticsDisabled} from './config'
 
 // This is so the stack trace the developer sees is one that's
 // closer to their code (because async stack traces are hard to follow).