Skip to content

Commit 3969992

Browse files
committed
fix: pass findOptions.meta to core methods
1 parent aeb132e commit 3969992

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

packages/core/src/query/findFirst.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,16 @@ async function _findFirst<
5858
collection,
5959
findOptions: keyOrOptions,
6060
}: FindFirstParams<TCollection, TCollectionDefaults, TSchema>): Promise<QueryResult<WrappedItem<TCollection, TCollectionDefaults, TSchema> | null>> {
61-
meta ??= {}
62-
6361
let findOptions: FindFirstOptions<TCollection, TCollectionDefaults, TSchema> = typeof keyOrOptions === 'string' || typeof keyOrOptions === 'number'
6462
? {
6563
key: keyOrOptions,
6664
}
6765
: keyOrOptions
6866

67+
meta ??= findOptions?.meta ?? {}
68+
6969
findOptions = store.$resolveFindOptions(collection, findOptions, false, meta)
70+
7071
const fetchPolicy = findOptions.fetchPolicy
7172

7273
let result: any

packages/core/src/query/findMany.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ async function _findMany<
5858
collection,
5959
findOptions,
6060
}: FindManyParams<TCollection, TCollectionDefaults, TSchema>): Promise<QueryResult<Array<WrappedItem<TCollection, TCollectionDefaults, TSchema>>>> {
61-
meta ??= {}
61+
meta ??= findOptions?.meta ?? {}
6262
findOptions ??= {}
6363

6464
findOptions = store.$resolveFindOptions(collection, findOptions, true, meta)

packages/core/src/query/peekFirst.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ export function peekFirst<
2929
findOptions: keyOrOptions,
3030
force,
3131
}: PeekFirstOptions<TCollection, TCollectionDefaults, TSchema>): QueryResult<WrappedItem<TCollection, TCollectionDefaults, TSchema> | null> {
32-
meta ??= {}
33-
3432
let findOptions: FindFirstOptions<TCollection, TCollectionDefaults, TSchema> = typeof keyOrOptions === 'string' || typeof keyOrOptions === 'number'
3533
? {
3634
key: keyOrOptions,
3735
}
3836
: keyOrOptions
3937

38+
meta ??= findOptions?.meta ?? {}
39+
4040
findOptions = store.$resolveFindOptions(collection, findOptions, false, meta)
41+
4142
const fetchPolicy = findOptions.fetchPolicy
4243

4344
const key = findOptions?.key

packages/core/src/query/peekMany.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function peekMany<
2828
findOptions,
2929
force,
3030
}: PeekManyOptions<TCollection, TCollectionDefaults, TSchema>): QueryResult<Array<WrappedItem<TCollection, TCollectionDefaults, TSchema>>> {
31-
meta ??= {}
31+
meta ??= findOptions?.meta ?? {}
3232

3333
findOptions = store.$resolveFindOptions(collection, findOptions ?? {}, true, meta)
3434
const fetchPolicy = findOptions.fetchPolicy

packages/core/src/subscription/subscribe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export async function subscribe<
2525
findOptions,
2626
meta,
2727
}: SubscribeOptions<TCollection, TCollectionDefaults, TSchema>): Promise<void> {
28-
meta ??= {}
28+
meta ??= findOptions?.meta ?? {}
2929

3030
await store.$hooks.callHook('subscribe', {
3131
store: store as unknown as GlobalStoreType,

packages/core/src/subscription/unsubscribe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export async function unsubscribe<
2525
findOptions,
2626
meta,
2727
}: UnsubscribeOptions<TCollection, TCollectionDefaults, TSchema>): Promise<void> {
28-
meta ??= {}
28+
meta ??= findOptions?.meta ?? {}
2929

3030
await store.$hooks.callHook('unsubscribe', {
3131
store: store as unknown as GlobalStoreType,

0 commit comments

Comments
 (0)