fix: use optional keys instead of new type

nuxt · Jun 3, 2022 · 5c9f6ca · 5c9f6ca
1 parent 5549466
commit 5c9f6ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/src/runtime/query/match/pipeline.ts b/src/runtime/query/match/pipeline.ts
@@ -1,4 +1,4 @@
-import type { QueryBuilderParams, QueryBuilderSchema, QueryPipe } from '../../types'
+import type { QueryBuilderParams, QueryPipe } from '../../types'
 import { apply, ensureArray, sortList, withoutKeys, withKeys } from './utils'
 import { createMatch } from '.'
 
@@ -9,7 +9,7 @@ export function createPipelineFetcher<T> (getContentsList: () => Promise<T[]>) {
   /**
    * Exctract surrounded items of specific condition
    */
-  const surround = (data: any[], { query, before, after }: QueryBuilderSchema['surround']) => {
+  const surround = (data: any[], { query, before, after }: QueryBuilderParams['surround']) => {
     const matchQuery = typeof query === 'string' ? { _path: query } : query
     // Find matched item index
     const index = data.findIndex(item => match(item, matchQuery))

diff --git a/src/runtime/types.d.ts b/src/runtime/types.d.ts
@@ -153,15 +153,15 @@ export interface SortFields {
 
 export type SortOptions = SortParams | SortFields
 
-export interface QueryBuilderSchema {
-  first: boolean
-  skip: number
-  limit: number
-  only: string[]
-  without: string[]
-  sort: SortOptions[]
-  where: object[]
-  surround: {
+export interface QueryBuilderParams {
+  first?: boolean
+  skip?: number
+  limit?: number
+  only?: string[]
+  without?: string[]
+  sort?: SortOptions[]
+  where?: object[]
+  surround?: {
     query: string | object
     before?: number
     after?: number
@@ -170,8 +170,6 @@ export interface QueryBuilderSchema {
   [key: string]: any
 }
 
-export type QueryBuilderParams = Partial<QueryBuilderSchema>
-
 export interface QueryBuilder<T = ParsedContentMeta> {
   /**
    * Select a subset of fields