From 32a677b304aba33eaa873e3530af4d592e9fbd2b Mon Sep 17 00:00:00 2001 From: ManUtopiK Date: Tue, 7 Jan 2025 06:06:48 +0100 Subject: [PATCH 1/2] Fix typos --- src/runtime/app.ts | 4 +-- src/runtime/internal/query.ts | 12 ++++----- src/runtime/nitro.ts | 4 +-- test/unit/collectionQureyBuilder.test.ts | 32 ++++++++++++------------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/runtime/app.ts b/src/runtime/app.ts index d242296ef..9256b5084 100644 --- a/src/runtime/app.ts +++ b/src/runtime/app.ts @@ -1,5 +1,5 @@ import type { Collections, PageCollections, CollectionQueryBuilder, SurroundOptions, SQLOperator, QueryGroupFunction } from '@nuxt/content' -import { collectionQureyBuilder } from './internal/query' +import { collectionQueryBuilder } from './internal/query' import { measurePerformance } from './internal/performance' import { generateNavigationTree } from './internal/navigation' import { generateItemSurround } from './internal/surround' @@ -15,7 +15,7 @@ interface ChainablePromise extends Promise(collection: T): CollectionQueryBuilder => { - return collectionQureyBuilder(collection, (collection, sql) => executeContentQuery(collection, sql)) + return collectionQueryBuilder(collection, (collection, sql) => executeContentQuery(collection, sql)) } export function queryCollectionNavigation(collection: T, fields?: Array) { diff --git a/src/runtime/internal/query.ts b/src/runtime/internal/query.ts index 3d6552243..a3831bc3f 100644 --- a/src/runtime/internal/query.ts +++ b/src/runtime/internal/query.ts @@ -7,7 +7,7 @@ const buildGroup = (group: CollectionQueryGroup 0 ? `(${conditions.join(` ${type} `)})` : '' } -export const collectionQureyGroup = (collection: T): CollectionQueryGroup => { +export const collectionQueryGroup = (collection: T): CollectionQueryGroup => { const conditions = [] as Array const query: CollectionQueryGroup = { @@ -55,12 +55,12 @@ export const collectionQureyGroup = (collection: T) return query }, andWhere(groupFactory: QueryGroupFunction) { - const group = groupFactory(collectionQureyGroup(collection)) + const group = groupFactory(collectionQueryGroup(collection)) conditions.push(buildGroup(group, 'AND')) return query }, orWhere(groupFactory: QueryGroupFunction) { - const group = groupFactory(collectionQureyGroup(collection)) + const group = groupFactory(collectionQueryGroup(collection)) conditions.push(buildGroup(group, 'OR')) return query }, @@ -69,7 +69,7 @@ export const collectionQureyGroup = (collection: T) return query } -export const collectionQureyBuilder = (collection: T, fetch: (collection: T, sql: string) => Promise): CollectionQueryBuilder => { +export const collectionQueryBuilder = (collection: T, fetch: (collection: T, sql: string) => Promise): CollectionQueryBuilder => { const params = { conditions: [] as Array, selectedFields: [] as Array, @@ -85,12 +85,12 @@ export const collectionQureyBuilder = (collection: const query: CollectionQueryBuilder = { andWhere(groupFactory: QueryGroupFunction) { - const group = groupFactory(collectionQureyGroup(collection)) + const group = groupFactory(collectionQueryGroup(collection)) params.conditions.push(buildGroup(group, 'AND')) return query }, orWhere(groupFactory: QueryGroupFunction) { - const group = groupFactory(collectionQureyGroup(collection)) + const group = groupFactory(collectionQueryGroup(collection)) params.conditions.push(buildGroup(group, 'OR')) return query }, diff --git a/src/runtime/nitro.ts b/src/runtime/nitro.ts index b7a05c005..ebaa7a294 100644 --- a/src/runtime/nitro.ts +++ b/src/runtime/nitro.ts @@ -1,6 +1,6 @@ import type { Collections, CollectionQueryBuilder, PageCollections, SurroundOptions, SQLOperator, QueryGroupFunction } from '@nuxt/content' import type { H3Event } from 'h3' -import { collectionQureyBuilder } from './internal/query' +import { collectionQueryBuilder } from './internal/query' import { generateNavigationTree } from './internal/navigation' import { generateItemSurround } from './internal/surround' import { generateSearchSections } from './internal/search' @@ -14,7 +14,7 @@ interface ChainablePromise extends Promise(event: H3Event, collection: T): CollectionQueryBuilder => { - return collectionQureyBuilder(collection, (collection, sql) => fetchQuery(event, collection, sql)) + return collectionQueryBuilder(collection, (collection, sql) => fetchQuery(event, collection, sql)) } export async function queryCollectionNavigationWithEvent(event: H3Event, collection: T, fields?: Array) { diff --git a/test/unit/collectionQureyBuilder.test.ts b/test/unit/collectionQureyBuilder.test.ts index c7a204b4b..f91822295 100644 --- a/test/unit/collectionQureyBuilder.test.ts +++ b/test/unit/collectionQureyBuilder.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, vi, beforeEach } from 'vitest' -import { collectionQureyBuilder } from '../../src/runtime/internal/query' +import { collectionQueryBuilder } from '../../src/runtime/internal/query' // Mock tables from manifest vi.mock('#content/manifest', () => ({ @@ -12,20 +12,20 @@ vi.mock('#content/manifest', () => ({ const mockFetch = vi.fn().mockResolvedValue(Promise.resolve([{}])) const mockCollection = 'articles' as never -describe('collectionQureyBuilder', () => { +describe('collectionQueryBuilder', () => { beforeEach(() => { mockFetch.mockClear() }) it('builds a simple select query', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query.all() expect(mockFetch).toHaveBeenCalledWith('articles', 'SELECT * FROM _articles ORDER BY stem ASC') }) it('builds query with where clause', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query.where('title', '=', 'Test Article').all() expect(mockFetch).toHaveBeenCalledWith( @@ -35,7 +35,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with multiple where clauses', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query .where('title', '=', 'Test Article') .where('published', '=', true) @@ -48,7 +48,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with IN operator', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query .where('category', 'IN', ['news', 'tech']) .all() @@ -60,7 +60,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with BETWEEN operator', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query .where('date', 'BETWEEN', ['2023-01-01', '2023-12-31']) .all() @@ -72,7 +72,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with selected fields', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query .select('title', 'date', 'author') .all() @@ -84,7 +84,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with order by', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query .order('date', 'DESC') .all() @@ -96,7 +96,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with limit without skip', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query .limit(5) .all() @@ -108,7 +108,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with limit and offset', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query .limit(10) .skip(20) @@ -121,7 +121,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with first()', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query.first() expect(mockFetch).toHaveBeenCalledWith( @@ -131,7 +131,7 @@ describe('collectionQureyBuilder', () => { }) it('builds count query', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query.count() expect(mockFetch).toHaveBeenCalledWith( @@ -141,7 +141,7 @@ describe('collectionQureyBuilder', () => { }) it('builds distinct count query', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query.count('author', true) expect(mockFetch).toHaveBeenCalledWith( @@ -151,7 +151,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with complex where conditions using andWhere', async () => { - const query = collectionQureyBuilder(mockCollection, mockFetch) + const query = collectionQueryBuilder(mockCollection, mockFetch) await query .where('published', '=', true) .andWhere(group => group @@ -170,7 +170,7 @@ describe('collectionQureyBuilder', () => { }) it('builds query with path', async () => { - const query = collectionQureyBuilder('articles' as never, mockFetch) + const query = collectionQueryBuilder('articles' as never, mockFetch) await query .path('/blog/my-article') .all() From c92539398ebc1007287816deb780763ebcea3142 Mon Sep 17 00:00:00 2001 From: ManUtopiK Date: Tue, 7 Jan 2025 06:11:15 +0100 Subject: [PATCH 2/2] Rename test --- ...lectionQureyBuilder.test.ts => collectionQueryBuilder.test.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/unit/{collectionQureyBuilder.test.ts => collectionQueryBuilder.test.ts} (100%) diff --git a/test/unit/collectionQureyBuilder.test.ts b/test/unit/collectionQueryBuilder.test.ts similarity index 100% rename from test/unit/collectionQureyBuilder.test.ts rename to test/unit/collectionQueryBuilder.test.ts