chore: wip add types for wrap

src/config.ts

@@ -1,6 +1,7 @@
 import { render } from 'react-dom'
 
-import type { Component, Config, RenderResult } from './models'
+import type { Component, Config, Extensions, RenderResult } from './models'
+import { configWrap } from './wrap'
 
 const mount = (Component: Component): RenderResult => {
   const rootNode = document.body.appendChild(document.createElement('div'))
@@ -10,20 +11,22 @@ const mount = (Component: Component): RenderResult => {
   return rootNode
 }
 
-let config: Config = {
+let config = {
   defaultHost: '',
   extend: {},
   mount,
   changeRoute: (path: string) => window.history.replaceState(null, '', path),
-}
+} satisfies Config<Extensions>
 
-function configure(newConfig: Partial<Config>) {
+function configure<T extends Extensions>(newConfig: Partial<Config<T>>) {
   config = {
     ...config,
     ...newConfig,
+    ...{ extend: { ...newConfig.extend } },
   }
+  return { wrap: (Component: any) => configWrap<T>(Component) }
 }
 
-const getConfig = (): Config => ({ ...config })
+const getConfig = (): Config<Extensions> => ({ ...config })
 
 export { configure, getConfig, Config, mount }

src/models.ts

@@ -44,10 +44,10 @@ export interface WrapResponse extends Partial<Response> {
 export type NetworkResponses = WrapResponse | WrapResponse[]
 
 export interface Wrap {
-  withNetwork: (responses?: NetworkResponses) => Wrap
-  atPath: (path: string, historyState?: object) => Wrap
-  withProps: (props: object) => Wrap
-  debugRequests: () => Wrap
+  withNetwork: (responses?: NetworkResponses) => Omit<this, 'withNetwork'>
+  atPath: (path: string, historyState?: object) => Omit<this, 'atPath'>
+  withProps: (props: object) => Omit<this, 'withProps'>
+  debugRequests: () => Omit<this, 'debugRequests'>
   mount: () => RenderResult
 }
 
@@ -65,7 +65,15 @@ export interface WrapExtensionAPI {
   addResponses: (responses: Array<WrapResponse>) => unknown
 }
 
-type Extension = <T>(extensionAPI: WrapExtensionAPI, args: T) => void
+type DropFirst<T extends unknown[]> = T extends [any, ...infer U] ? U : never
+
+type Extension = (extensionAPI: WrapExtensionAPI, ...args: any[]) => void
+type WrappedExtension<T extends Extension> = DropFirst<Parameters<T>>
+
+export type WrappedExtensions<T extends Extensions> = Record<
+  keyof T,
+  (...args: WrappedExtension<T[keyof T]>) => Wrap & WrappedExtensions<T>
+>
 
 type Extensions = {
   [key: string]: Extension
@@ -76,10 +84,10 @@ type Component = React.ReactElement<any, any>
 export type RenderResult = TLRenderResult | HTMLDivElement
 export type Mount = (component: Component) => RenderResult
 
-export interface Config {
+export interface Config<T> {
   defaultHost: string
   mount: Mount
-  extend: Extensions
+  extend: T
   changeRoute: (path: string) => void
   history?: BrowserHistory
   portal?: string

src/wrap.tsx

@@ -3,12 +3,13 @@ import * as React from 'react'
 import { mockNetwork } from './mockNetwork'
 import { getConfig } from './config'
 import { updateOptions, getOptions } from './options'
-import type {
+import {
   Response,
   Wrap,
   WrapExtensionAPI,
   Extension,
   Extensions,
+  WrappedExtensions,
 } from './models'
 import { vi } from 'vitest'
 import type { MockedFunction } from 'vitest'
@@ -22,7 +23,7 @@ afterEach(() => {
   mockedFetch.mockRestore()
 })
 
-const wrap = (component: unknown): Wrap => {
+const wrap = (component: unknown) => {
   updateOptions({
     Component: component,
     responses: [],
@@ -35,7 +36,20 @@ const wrap = (component: unknown): Wrap => {
   return wrapWith()
 }
 
-const wrapWith = (): Wrap => {
+export const configWrap = <T extends Extensions>(component: unknown) => {
+  updateOptions({
+    Component: component,
+    responses: [],
+    props: {},
+    path: '',
+    hasPath: false,
+    debug: process.env.npm_config_debugRequests === 'true',
+  })
+
+  return wrapWith() as Wrap & WrappedExtensions<T>
+}
+
+const wrapWith = () => {
   const extensions = extendWith()
 
   return {

tests/lib/extend.test.ts

@@ -1,16 +1,16 @@
 import { render, screen, fireEvent } from '@testing-library/react'
 import { vi, it, expect } from 'vitest'
-import { wrap, configure } from '../../src/index'
+import { configure } from '../../src/index'
 
 import { MyComponentWithLogin } from '../components.mock'
 
 it('should extend wrapito', async () => {
   const otherCustomExtension = vi.fn()
   const customArgs = { foo: 'bar' }
-  configure({
+  const { wrap } = configure({
     mount: render,
     extend: {
-      withLogin: ({ addResponses }, username: string) =>
+      withLogin: ({ addResponses }, username: string, test: boolean) =>
         addResponses([
           {
             path: '/path/to/login/',
@@ -19,15 +19,21 @@
             responseBody: username,
           },
         ]),
-      withOtherCustomExtension: () => otherCustomExtension(customArgs),
+      withOtherCustomExtension: ({}) => otherCustomExtension(customArgs),
     },
   })
+  wrap(MyComponentWithLogin)
+    .withNetwork()
+    .debugRequests()
+    .withOtherCustomExtension()
+    .withLogin('Fran Perea')
+    .mount()
   wrap(MyComponentWithLogin)
     .withLogin('Fran Perea')
     .withOtherCustomExtension()
     .mount()
 
   expect(await screen.findByText('Logged in as Fran Perea')).toBeInTheDocument()
   expect(otherCustomExtension).toHaveBeenCalledWith(customArgs)
 })
 
@@ -46,7 +52,7 @@
         ]),
     },
   })
   wrap(MyComponentWithLogin)
     .withLogin('Fran Perea')
     .withNetwork([
       {
@@ -79,7 +85,7 @@
         ]),
     },
   })
   wrap(MyComponentWithLogin)
     .withNetwork([
       {
         path: '/path/to/logout/',