Skip to content

Commit a72d134

Browse files
author
devgioele
committed
use an entry point for each router
1 parent 7242d85 commit a72d134

14 files changed

Lines changed: 114 additions & 110 deletions

‎package.json‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,41 @@
22
"name": "@aboutbits/react-pagination",
33
"version": "1.0.2",
44
"description": "Pagination hooks for React",
5-
"main": "dist/cjs/index.js",
6-
"module": "dist/esm/index.js",
7-
"types": "dist/types/index.d.ts",
85
"exports": {
96
".": {
10-
"types": "./dist/types/index.d.ts",
11-
"import": "./dist/esm/index.js",
12-
"require": "./dist/cjs/index.js"
7+
"types": "./dist/types/engine/index.d.ts",
8+
"import": "./dist/esm/engine/index.js",
9+
"require": "./dist/cjs/engine/index.js"
1310
},
14-
"./zod": {
15-
"types": "./dist/types/zod/index.d.ts",
16-
"import": "./dist/esm/zod/index.js",
17-
"require": "./dist/cjs/zod/index.js"
11+
"./next-router": {
12+
"types": "./dist/types/routers/nextRouter.d.ts",
13+
"import": "./dist/esm/routers/nextRouter.js",
14+
"require": "./dist/cjs/routers/nextRouter.js"
15+
},
16+
"./in-memory": {
17+
"types": "./dist/types/routers/inMemory.d.ts",
18+
"import": "./dist/esm/routers/inMemory.js",
19+
"require": "./dist/cjs/routers/inMemory.js"
20+
},
21+
"./react-router": {
22+
"types": "./dist/types/routers/reactRouter.d.ts",
23+
"import": "./dist/esm/routers/reactRouter.js",
24+
"require": "./dist/cjs/routers/reactRouter.js"
25+
},
26+
"./next-router/zod": {
27+
"types": "./dist/types/zod/routers/nextRouter.d.ts",
28+
"import": "./dist/esm/zod/routers/nextRouter.js",
29+
"require": "./dist/cjs/zod/routers/nextRouter.js"
30+
},
31+
"./in-memory/zod": {
32+
"types": "./dist/types/zod/routers/inMemory.d.ts",
33+
"import": "./dist/esm/zod/routers/inMemory.js",
34+
"require": "./dist/cjs/zod/routers/inMemory.js"
35+
},
36+
"./react-router/zod": {
37+
"types": "./dist/types/zod/routers/reactRouter.d.ts",
38+
"import": "./dist/esm/zod/routers/reactRouter.js",
39+
"require": "./dist/cjs/zod/routers/reactRouter.js"
1840
}
1941
},
2042
"engines": {

‎src/index.ts‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/routers/__test__/inMemory.test.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { act, renderHook } from '@testing-library/react'
22
import { z } from 'zod'
33
import { NonNullableRecord } from '../../utils'
44
import {
5-
useInMemoryQuery,
6-
useInMemoryPagination,
7-
useInMemoryQueryAndPagination,
8-
} from '../../zod'
5+
useQuery,
6+
usePagination,
7+
useQueryAndPagination,
8+
} from '../../zod/routers/inMemory'
99

1010
describe('InMemory', () => {
1111
const searchSchema = z.object({
@@ -14,12 +14,12 @@ describe('InMemory', () => {
1414

1515
const useInMemoryQueryWithSearch = (
1616
defaultQuery: NonNullableRecord<z.infer<typeof searchSchema>>
17-
) => useInMemoryQuery(defaultQuery, searchSchema)
17+
) => useQuery(defaultQuery, searchSchema)
1818

1919
test('should set default page and size', () => {
2020
const page = 0
2121
const size = 15
22-
const { result } = renderHook(() => useInMemoryPagination({ page, size }))
22+
const { result } = renderHook(() => usePagination({ page, size }))
2323

2424
expect(result.current.page).toBe(page)
2525
expect(result.current.size).toBe(size)
@@ -28,7 +28,7 @@ describe('InMemory', () => {
2828
test('should change page', () => {
2929
const page = 2
3030

31-
const { result } = renderHook(() => useInMemoryPagination())
31+
const { result } = renderHook(() => usePagination())
3232

3333
act(() => {
3434
result.current.setPage(page)
@@ -56,7 +56,7 @@ describe('InMemory', () => {
5656
const page = 2
5757

5858
const { result } = renderHook(() =>
59-
useInMemoryQueryAndPagination({ search: '' }, searchSchema)
59+
useQueryAndPagination({ search: '' }, searchSchema)
6060
)
6161

6262
act(() => {
@@ -80,7 +80,7 @@ describe('InMemory', () => {
8080
test('change default parameters', () => {
8181
const page = 1
8282
const size = 10
83-
const { result } = renderHook(() => useInMemoryPagination({ page, size }))
83+
const { result } = renderHook(() => usePagination({ page, size }))
8484

8585
expect(result.current.page).toBe(page)
8686
expect(result.current.size).toBe(size)
@@ -93,7 +93,7 @@ describe('InMemory', () => {
9393
const page = 2
9494

9595
const { result } = renderHook(() =>
96-
useInMemoryQueryAndPagination({ search: defaultSearch }, searchSchema)
96+
useQueryAndPagination({ search: defaultSearch }, searchSchema)
9797
)
9898

9999
act(() => {
@@ -128,7 +128,7 @@ describe('InMemory', () => {
128128
const page = 2
129129

130130
const { result } = renderHook(() =>
131-
useInMemoryQueryAndPagination({ search: defaultSearch }, searchSchema)
131+
useQueryAndPagination({ search: defaultSearch }, searchSchema)
132132
)
133133

134134
act(() => {
@@ -162,7 +162,7 @@ describe('InMemory', () => {
162162
})
163163

164164
const { result } = renderHook(() =>
165-
useInMemoryQuery({ search: '', department: '' }, schema)
165+
useQuery({ search: '', department: '' }, schema)
166166
)
167167

168168
act(() => {
@@ -181,7 +181,7 @@ describe('InMemory', () => {
181181
const search = ''
182182

183183
const { result } = renderHook(() =>
184-
useInMemoryQuery({ search: 'Default search' }, searchSchema)
184+
useQuery({ search: 'Default search' }, searchSchema)
185185
)
186186

187187
act(() => {

‎src/routers/__test__/nextRouter.test.ts‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { z } from 'zod'
44
import { vi } from 'vitest'
55
import { NonNullableRecord } from '../../utils'
66
import {
7-
useNextRouterQuery,
8-
useNextRouterPagination,
9-
useNextRouterQueryAndPagination,
10-
} from '../../zod'
7+
useQuery,
8+
usePagination,
9+
useQueryAndPagination,
10+
} from '../../zod/routers/nextRouter'
1111

1212
vi.mock('next/router', () => require('next-router-mock'))
1313

@@ -22,12 +22,12 @@ describe('NextRouter', () => {
2222

2323
const useNextRouterQueryWithSearch = (
2424
defaultQuery: NonNullableRecord<z.infer<typeof searchSchema>>
25-
) => useNextRouterQuery(defaultQuery, searchSchema)
25+
) => useQuery(defaultQuery, searchSchema)
2626

2727
test('should set default page and size', () => {
2828
const page = 0
2929
const size = 15
30-
const { result } = renderHook(() => useNextRouterPagination({ page, size }))
30+
const { result } = renderHook(() => usePagination({ page, size }))
3131

3232
expect(result.current.page).toBe(page)
3333
expect(result.current.size).toBe(size)
@@ -36,7 +36,7 @@ describe('NextRouter', () => {
3636
test('should change page', () => {
3737
const page = 2
3838

39-
const { result } = renderHook(() => useNextRouterPagination())
39+
const { result } = renderHook(() => usePagination())
4040

4141
act(() => {
4242
result.current.setPage(page)
@@ -66,7 +66,7 @@ describe('NextRouter', () => {
6666
const page = 2
6767

6868
const { result } = renderHook(() =>
69-
useNextRouterQueryAndPagination({ search: '' }, searchSchema)
69+
useQueryAndPagination({ search: '' }, searchSchema)
7070
)
7171

7272
act(() => {
@@ -93,7 +93,7 @@ describe('NextRouter', () => {
9393
test('change default parameters', () => {
9494
const page = 1
9595
const size = 10
96-
const { result } = renderHook(() => useNextRouterPagination({ page, size }))
96+
const { result } = renderHook(() => usePagination({ page, size }))
9797

9898
expect(result.current.page).toBe(page)
9999
expect(result.current.size).toBe(size)
@@ -106,7 +106,7 @@ describe('NextRouter', () => {
106106
const page = 2
107107

108108
const { result } = renderHook(() =>
109-
useNextRouterQueryAndPagination({ search: defaultSearch }, searchSchema)
109+
useQueryAndPagination({ search: defaultSearch }, searchSchema)
110110
)
111111

112112
act(() => {
@@ -148,7 +148,7 @@ describe('NextRouter', () => {
148148
const page = 2
149149

150150
const { result } = renderHook(() =>
151-
useNextRouterQueryAndPagination({ search: defaultSearch }, searchSchema)
151+
useQueryAndPagination({ search: defaultSearch }, searchSchema)
152152
)
153153

154154
act(() => {
@@ -189,10 +189,7 @@ describe('NextRouter', () => {
189189
})
190190

191191
const { result } = renderHook(() =>
192-
useNextRouterQuery(
193-
{ search: '', department: '', age: defaultAge },
194-
schema
195-
)
192+
useQuery({ search: '', department: '', age: defaultAge }, schema)
196193
)
197194

198195
act(() => {
@@ -212,9 +209,7 @@ describe('NextRouter', () => {
212209
const greeting = 'hello'
213210
router.query = { greeting }
214211

215-
const { result } = renderHook(() =>
216-
useNextRouterQuery({ search: '' }, searchSchema)
217-
)
212+
const { result } = renderHook(() => useQuery({ search: '' }, searchSchema))
218213

219214
act(() => {
220215
result.current.setQuery({ search: 'Max' })
@@ -230,7 +225,7 @@ describe('NextRouter', () => {
230225
router.query = { search: 'Max' }
231226

232227
const { result } = renderHook(() =>
233-
useNextRouterQuery({ search: defaultSearch }, searchSchema)
228+
useQuery({ search: defaultSearch }, searchSchema)
234229
)
235230

236231
act(() => {
@@ -245,7 +240,7 @@ describe('NextRouter', () => {
245240
const search = ''
246241

247242
const { result } = renderHook(() =>
248-
useNextRouterQuery({ search: 'Default search' }, searchSchema)
243+
useQuery({ search: 'Default search' }, searchSchema)
249244
)
250245

251246
act(() => {

‎src/routers/__test__/reactRouter.test.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { z } from 'zod'
33
import { BrowserRouter } from 'react-router-dom'
44
import { NonNullableRecord } from '../../utils'
55
import {
6-
useReactRouterQuery,
7-
useReactRouterPagination,
8-
useReactRouterQueryAndPagination,
9-
} from '../../zod'
6+
useQuery,
7+
usePagination,
8+
useQueryAndPagination,
9+
} from '../../zod/routers/reactRouter'
1010

1111
const renderHookWithContext = <Result, Props>(
1212
render: (initialProps: Props) => Result
@@ -28,13 +28,13 @@ describe('ReactRouter', () => {
2828

2929
const useReactRouterQueryWithSearch = (
3030
defaultQuery: NonNullableRecord<z.infer<typeof searchSchema>>
31-
) => useReactRouterQuery(defaultQuery, searchSchema)
31+
) => useQuery(defaultQuery, searchSchema)
3232

3333
test('should set default page and size', () => {
3434
const page = 0
3535
const size = 15
3636
const { result } = renderHookWithContext(() =>
37-
useReactRouterPagination({ page, size })
37+
usePagination({ page, size })
3838
)
3939

4040
expect(result.current.page).toBe(page)
@@ -44,7 +44,7 @@ describe('ReactRouter', () => {
4444
test('should change page', () => {
4545
const page = 2
4646

47-
const { result } = renderHookWithContext(() => useReactRouterPagination())
47+
const { result } = renderHookWithContext(() => usePagination())
4848

4949
act(() => {
5050
result.current.setPage(page)
@@ -74,7 +74,7 @@ describe('ReactRouter', () => {
7474
const page = 2
7575

7676
const { result } = renderHookWithContext(() =>
77-
useReactRouterQueryAndPagination({ search: '' }, searchSchema)
77+
useQueryAndPagination({ search: '' }, searchSchema)
7878
)
7979

8080
act(() => {
@@ -100,7 +100,7 @@ describe('ReactRouter', () => {
100100
const page = 1
101101
const size = 10
102102
const { result } = renderHookWithContext(() =>
103-
useReactRouterPagination({ page, size })
103+
usePagination({ page, size })
104104
)
105105

106106
expect(result.current.page).toBe(page)
@@ -114,7 +114,7 @@ describe('ReactRouter', () => {
114114
const page = 2
115115

116116
const { result } = renderHookWithContext(() =>
117-
useReactRouterQueryAndPagination({ search: defaultSearch }, searchSchema)
117+
useQueryAndPagination({ search: defaultSearch }, searchSchema)
118118
)
119119

120120
act(() => {
@@ -152,7 +152,7 @@ describe('ReactRouter', () => {
152152
const page = 2
153153

154154
const { result } = renderHookWithContext(() =>
155-
useReactRouterQueryAndPagination({ search: defaultSearch }, searchSchema)
155+
useQueryAndPagination({ search: defaultSearch }, searchSchema)
156156
)
157157

158158
act(() => {
@@ -189,7 +189,7 @@ describe('ReactRouter', () => {
189189
})
190190

191191
const { result } = renderHookWithContext(() =>
192-
useReactRouterQuery({ search: '', department: '' }, schema)
192+
useQuery({ search: '', department: '' }, schema)
193193
)
194194

195195
act(() => {
@@ -210,7 +210,7 @@ describe('ReactRouter', () => {
210210
window.history.pushState({}, '', `/?greeting=${greeting}`)
211211

212212
const { result } = renderHookWithContext(() =>
213-
useReactRouterQuery({ search: '' }, searchSchema)
213+
useQuery({ search: '' }, searchSchema)
214214
)
215215

216216
act(() => {
@@ -229,7 +229,7 @@ describe('ReactRouter', () => {
229229
window.history.pushState({}, '', `/?search=Max`)
230230

231231
const { result } = renderHookWithContext(() =>
232-
useReactRouterQuery({ search: defaultSearch }, searchSchema)
232+
useQuery({ search: defaultSearch }, searchSchema)
233233
)
234234

235235
act(() => {
@@ -244,7 +244,7 @@ describe('ReactRouter', () => {
244244
const search = ''
245245

246246
const { result } = renderHookWithContext(() =>
247-
useReactRouterQuery({ search: 'Default search' }, searchSchema)
247+
useQuery({ search: 'Default search' }, searchSchema)
248248
)
249249

250250
act(() => {

0 commit comments

Comments
 (0)