Extract types to seperate file and clean up the code

Author: amoutonbrady

src/index.ts

@@ -1,48 +1,31 @@
-import { getQueriesForElement, prettyDOM, Queries, BoundFunction } from "@testing-library/dom";
-import { JSX } from "solid-js";
+import { getQueriesForElement, prettyDOM } from "@testing-library/dom";
 import { hydrate as solidHydrate, render as solidRender } from "solid-js/web";
-import type { OptionsReceived } from "pretty-format";
+
+import type { Ui, Result, Options, Ref } from "./types";
+
+/**
+ * Shim for the teardown function
+ */
+declare var teardown: Function | undefined;
 
 /* istanbul ignore next */
 if (!process.env.STL_SKIP_AUTO_CLEANUP) {
   if (typeof afterEach === "function") {
     afterEach(async () => {
       await cleanup();
     });
-    // @ts-ignore
   } else if (typeof teardown === "function") {
-    // @ts-ignore
     teardown(async () => {
       await cleanup();
     });
   }
 }
 
-const mountedContainers = new Set<{ container: HTMLElement; dispose: () => void }>();
+const mountedContainers = new Set<Ref>();
+
+function render(ui: Ui, options: Options = {}): Result {
+  let { container, baseElement = container, queries, hydrate = false } = options;
 
-function render(
-  ui: () => JSX.Element,
-  {
-    container,
-    baseElement = container,
-    queries,
-    hydrate = false
-  }: {
-    container?: HTMLElement;
-    baseElement?: HTMLElement;
-    queries?: Queries;
-    hydrate?: boolean;
-  } = {}
-): {
-  container: HTMLElement;
-  baseElement: HTMLElement;
-  debug: (
-    baseElement?: HTMLElement | HTMLElement[],
-    maxLength?: number,
-    options?: OptionsReceived
-  ) => void;
-  unmount: () => void;
-} & { [P in keyof Queries]: BoundFunction<Queries[P]> } {
   if (!baseElement) {
     // Default to document.body instead of documentElement to avoid output of potentially-large
     // head elements (such as JSS style blocks) in debug output.
@@ -65,16 +48,16 @@ function render(
   return {
     container,
     baseElement,
-    debug: (el = baseElement, maxLength?: number, options?: OptionsReceived) =>
+    debug: (el = baseElement, maxLength, options) =>
       Array.isArray(el)
         ? el.forEach(e => console.log(prettyDOM(e, maxLength, options)))
         : console.log(prettyDOM(el, maxLength, options)),
     unmount: dispose,
     ...getQueriesForElement(baseElement, queries)
-  } as any;
+  } as Result;
 }
 
-function cleanupAtContainer(ref: { container: HTMLElement; dispose: () => void }) {
+function cleanupAtContainer(ref: Ref) {
   const { container, dispose } = ref;
   dispose();
 

src/types.ts

@@ -0,0 +1,32 @@
+import type { JSX } from "solid-js";
+import type { OptionsReceived } from "pretty-format";
+import type { Queries, BoundFunction } from "@testing-library/dom";
+
+export interface Ref {
+  container: HTMLElement;
+  dispose: () => void;
+}
+
+export type Ui = () => JSX.Element;
+
+export interface Options {
+  container?: HTMLElement;
+  baseElement?: HTMLElement;
+  queries?: Queries;
+  hydrate?: boolean;
+}
+
+export type Extra = { [P in keyof Queries]: BoundFunction<Queries[P]> };
+
+export type DebugFn = (
+  baseElement?: HTMLElement | HTMLElement[],
+  maxLength?: number,
+  options?: OptionsReceived
+) => void;
+
+export type Result = {
+  container: HTMLElement;
+  baseElement: HTMLElement;
+  debug: DebugFn;
+  unmount: () => void;
+} & Extra;