Skip to content

Commit 71036e2

Browse files
authored
fix(typos): collectionQureyBuilder (#2953)
1 parent 8a9af69 commit 71036e2

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

src/runtime/app.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Collections, PageCollections, CollectionQueryBuilder, SurroundOptions, SQLOperator, QueryGroupFunction } from '@nuxt/content'
2-
import { collectionQureyBuilder } from './internal/query'
2+
import { collectionQueryBuilder } from './internal/query'
33
import { measurePerformance } from './internal/performance'
44
import { generateNavigationTree } from './internal/navigation'
55
import { generateItemSurround } from './internal/surround'
@@ -15,7 +15,7 @@ interface ChainablePromise<T extends keyof PageCollections, R> extends Promise<R
1515
}
1616

1717
export const queryCollection = <T extends keyof Collections>(collection: T): CollectionQueryBuilder<Collections[T]> => {
18-
return collectionQureyBuilder<T>(collection, (collection, sql) => executeContentQuery(collection, sql))
18+
return collectionQueryBuilder<T>(collection, (collection, sql) => executeContentQuery(collection, sql))
1919
}
2020

2121
export function queryCollectionNavigation<T extends keyof PageCollections>(collection: T, fields?: Array<keyof PageCollections[T]>) {

src/runtime/internal/query.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const buildGroup = <T extends keyof Collections>(group: CollectionQueryGroup<Col
77
return conditions.length > 0 ? `(${conditions.join(` ${type} `)})` : ''
88
}
99

10-
export const collectionQureyGroup = <T extends keyof Collections>(collection: T): CollectionQueryGroup<Collections[T]> => {
10+
export const collectionQueryGroup = <T extends keyof Collections>(collection: T): CollectionQueryGroup<Collections[T]> => {
1111
const conditions = [] as Array<string>
1212

1313
const query: CollectionQueryGroup<Collections[T]> = {
@@ -55,12 +55,12 @@ export const collectionQureyGroup = <T extends keyof Collections>(collection: T)
5555
return query
5656
},
5757
andWhere(groupFactory: QueryGroupFunction<Collections[T]>) {
58-
const group = groupFactory(collectionQureyGroup(collection))
58+
const group = groupFactory(collectionQueryGroup(collection))
5959
conditions.push(buildGroup(group, 'AND'))
6060
return query
6161
},
6262
orWhere(groupFactory: QueryGroupFunction<Collections[T]>) {
63-
const group = groupFactory(collectionQureyGroup(collection))
63+
const group = groupFactory(collectionQueryGroup(collection))
6464
conditions.push(buildGroup(group, 'OR'))
6565
return query
6666
},
@@ -69,7 +69,7 @@ export const collectionQureyGroup = <T extends keyof Collections>(collection: T)
6969
return query
7070
}
7171

72-
export const collectionQureyBuilder = <T extends keyof Collections>(collection: T, fetch: (collection: T, sql: string) => Promise<Collections[T][]>): CollectionQueryBuilder<Collections[T]> => {
72+
export const collectionQueryBuilder = <T extends keyof Collections>(collection: T, fetch: (collection: T, sql: string) => Promise<Collections[T][]>): CollectionQueryBuilder<Collections[T]> => {
7373
const params = {
7474
conditions: [] as Array<string>,
7575
selectedFields: [] as Array<keyof Collections[T]>,
@@ -85,12 +85,12 @@ export const collectionQureyBuilder = <T extends keyof Collections>(collection:
8585

8686
const query: CollectionQueryBuilder<Collections[T]> = {
8787
andWhere(groupFactory: QueryGroupFunction<Collections[T]>) {
88-
const group = groupFactory(collectionQureyGroup(collection))
88+
const group = groupFactory(collectionQueryGroup(collection))
8989
params.conditions.push(buildGroup(group, 'AND'))
9090
return query
9191
},
9292
orWhere(groupFactory: QueryGroupFunction<Collections[T]>) {
93-
const group = groupFactory(collectionQureyGroup(collection))
93+
const group = groupFactory(collectionQueryGroup(collection))
9494
params.conditions.push(buildGroup(group, 'OR'))
9595
return query
9696
},

src/runtime/nitro.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Collections, CollectionQueryBuilder, PageCollections, SurroundOptions, SQLOperator, QueryGroupFunction } from '@nuxt/content'
22
import type { H3Event } from 'h3'
3-
import { collectionQureyBuilder } from './internal/query'
3+
import { collectionQueryBuilder } from './internal/query'
44
import { generateNavigationTree } from './internal/navigation'
55
import { generateItemSurround } from './internal/surround'
66
import { generateSearchSections } from './internal/search'
@@ -14,7 +14,7 @@ interface ChainablePromise<T extends keyof PageCollections, R> extends Promise<R
1414
}
1515

1616
export const queryCollectionWithEvent = <T extends keyof Collections>(event: H3Event, collection: T): CollectionQueryBuilder<Collections[T]> => {
17-
return collectionQureyBuilder<T>(collection, (collection, sql) => fetchQuery(event, collection, sql))
17+
return collectionQueryBuilder<T>(collection, (collection, sql) => fetchQuery(event, collection, sql))
1818
}
1919

2020
export async function queryCollectionNavigationWithEvent<T extends keyof PageCollections>(event: H3Event, collection: T, fields?: Array<keyof PageCollections[T]>) {

test/unit/collectionQureyBuilder.test.ts renamed to test/unit/collectionQueryBuilder.test.ts

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, it, expect, vi, beforeEach } from 'vitest'
2-
import { collectionQureyBuilder } from '../../src/runtime/internal/query'
2+
import { collectionQueryBuilder } from '../../src/runtime/internal/query'
33

44
// Mock tables from manifest
55
vi.mock('#content/manifest', () => ({
@@ -12,20 +12,20 @@ vi.mock('#content/manifest', () => ({
1212
const mockFetch = vi.fn().mockResolvedValue(Promise.resolve([{}]))
1313
const mockCollection = 'articles' as never
1414

15-
describe('collectionQureyBuilder', () => {
15+
describe('collectionQueryBuilder', () => {
1616
beforeEach(() => {
1717
mockFetch.mockClear()
1818
})
1919

2020
it('builds a simple select query', async () => {
21-
const query = collectionQureyBuilder(mockCollection, mockFetch)
21+
const query = collectionQueryBuilder(mockCollection, mockFetch)
2222
await query.all()
2323

2424
expect(mockFetch).toHaveBeenCalledWith('articles', 'SELECT * FROM _articles ORDER BY stem ASC')
2525
})
2626

2727
it('builds query with where clause', async () => {
28-
const query = collectionQureyBuilder(mockCollection, mockFetch)
28+
const query = collectionQueryBuilder(mockCollection, mockFetch)
2929
await query.where('title', '=', 'Test Article').all()
3030

3131
expect(mockFetch).toHaveBeenCalledWith(
@@ -35,7 +35,7 @@ describe('collectionQureyBuilder', () => {
3535
})
3636

3737
it('builds query with multiple where clauses', async () => {
38-
const query = collectionQureyBuilder(mockCollection, mockFetch)
38+
const query = collectionQueryBuilder(mockCollection, mockFetch)
3939
await query
4040
.where('title', '=', 'Test Article')
4141
.where('published', '=', true)
@@ -48,7 +48,7 @@ describe('collectionQureyBuilder', () => {
4848
})
4949

5050
it('builds query with IN operator', async () => {
51-
const query = collectionQureyBuilder(mockCollection, mockFetch)
51+
const query = collectionQueryBuilder(mockCollection, mockFetch)
5252
await query
5353
.where('category', 'IN', ['news', 'tech'])
5454
.all()
@@ -60,7 +60,7 @@ describe('collectionQureyBuilder', () => {
6060
})
6161

6262
it('builds query with BETWEEN operator', async () => {
63-
const query = collectionQureyBuilder(mockCollection, mockFetch)
63+
const query = collectionQueryBuilder(mockCollection, mockFetch)
6464
await query
6565
.where('date', 'BETWEEN', ['2023-01-01', '2023-12-31'])
6666
.all()
@@ -72,7 +72,7 @@ describe('collectionQureyBuilder', () => {
7272
})
7373

7474
it('builds query with selected fields', async () => {
75-
const query = collectionQureyBuilder(mockCollection, mockFetch)
75+
const query = collectionQueryBuilder(mockCollection, mockFetch)
7676
await query
7777
.select('title', 'date', 'author')
7878
.all()
@@ -84,7 +84,7 @@ describe('collectionQureyBuilder', () => {
8484
})
8585

8686
it('builds query with order by', async () => {
87-
const query = collectionQureyBuilder(mockCollection, mockFetch)
87+
const query = collectionQueryBuilder(mockCollection, mockFetch)
8888
await query
8989
.order('date', 'DESC')
9090
.all()
@@ -96,7 +96,7 @@ describe('collectionQureyBuilder', () => {
9696
})
9797

9898
it('builds query with limit without skip', async () => {
99-
const query = collectionQureyBuilder(mockCollection, mockFetch)
99+
const query = collectionQueryBuilder(mockCollection, mockFetch)
100100
await query
101101
.limit(5)
102102
.all()
@@ -108,7 +108,7 @@ describe('collectionQureyBuilder', () => {
108108
})
109109

110110
it('builds query with limit and offset', async () => {
111-
const query = collectionQureyBuilder(mockCollection, mockFetch)
111+
const query = collectionQueryBuilder(mockCollection, mockFetch)
112112
await query
113113
.limit(10)
114114
.skip(20)
@@ -121,7 +121,7 @@ describe('collectionQureyBuilder', () => {
121121
})
122122

123123
it('builds query with first()', async () => {
124-
const query = collectionQureyBuilder(mockCollection, mockFetch)
124+
const query = collectionQueryBuilder(mockCollection, mockFetch)
125125
await query.first()
126126

127127
expect(mockFetch).toHaveBeenCalledWith(
@@ -131,7 +131,7 @@ describe('collectionQureyBuilder', () => {
131131
})
132132

133133
it('builds count query', async () => {
134-
const query = collectionQureyBuilder(mockCollection, mockFetch)
134+
const query = collectionQueryBuilder(mockCollection, mockFetch)
135135
await query.count()
136136

137137
expect(mockFetch).toHaveBeenCalledWith(
@@ -141,7 +141,7 @@ describe('collectionQureyBuilder', () => {
141141
})
142142

143143
it('builds distinct count query', async () => {
144-
const query = collectionQureyBuilder(mockCollection, mockFetch)
144+
const query = collectionQueryBuilder(mockCollection, mockFetch)
145145
await query.count('author', true)
146146

147147
expect(mockFetch).toHaveBeenCalledWith(
@@ -151,7 +151,7 @@ describe('collectionQureyBuilder', () => {
151151
})
152152

153153
it('builds query with complex where conditions using andWhere', async () => {
154-
const query = collectionQureyBuilder(mockCollection, mockFetch)
154+
const query = collectionQueryBuilder(mockCollection, mockFetch)
155155
await query
156156
.where('published', '=', true)
157157
.andWhere(group => group
@@ -170,7 +170,7 @@ describe('collectionQureyBuilder', () => {
170170
})
171171

172172
it('builds query with path', async () => {
173-
const query = collectionQureyBuilder('articles' as never, mockFetch)
173+
const query = collectionQueryBuilder('articles' as never, mockFetch)
174174
await query
175175
.path('/blog/my-article')
176176
.all()

0 commit comments

Comments
 (0)