Skip to content

Commit e68ba1e

Browse files
wattanxwattanx
committed
fix!: change default values of data and error from null to undefined
1 parent f64da88 commit e68ba1e

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎packages/bridge/src/runtime/composables/asyncData.ts‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export interface AsyncDataOptions<
2020
ResT,
2121
DataT = ResT,
2222
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
23-
DefaultT = null,
23+
DefaultT = undefined,
2424
> {
2525
/**
2626
* Whether to fetch on the server side.
@@ -93,7 +93,7 @@ export interface _AsyncData<DataT, ErrorT> {
9393
refresh: (opts?: AsyncDataExecuteOptions) => Promise<DataT>
9494
execute: (opts?: AsyncDataExecuteOptions) => Promise<DataT>
9595
clear: () => void
96-
error: Ref<ErrorT | null>
96+
error: Ref<ErrorT | undefined>
9797
status: Ref<AsyncDataRequestStatus>
9898
}
9999

@@ -107,11 +107,11 @@ export function useAsyncData<
107107
NuxtErrorDataT = unknown,
108108
DataT = ResT,
109109
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
110-
DefaultT = null,
110+
DefaultT = undefined,
111111
> (
112112
handler: (ctx?: NuxtAppCompat) => Promise<ResT>,
113113
options?: AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>
114-
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null>
114+
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined>
115115
export function useAsyncData<
116116
ResT,
117117
NuxtErrorDataT = unknown,
@@ -121,18 +121,18 @@ export function useAsyncData<
121121
> (
122122
handler: (ctx?: NuxtAppCompat) => Promise<ResT>,
123123
options?: AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>
124-
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null>
124+
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined>
125125
export function useAsyncData<
126126
ResT,
127127
NuxtErrorDataT = unknown,
128128
DataT = ResT,
129129
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
130-
DefaultT = null,
130+
DefaultT = undefined,
131131
> (
132132
key: string,
133133
handler: (ctx?: NuxtAppCompat) => Promise<ResT>,
134134
options?: AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>
135-
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null>
135+
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined>
136136
export function useAsyncData<
137137
ResT,
138138
NuxtErrorDataT = unknown,
@@ -143,14 +143,14 @@ export function useAsyncData<
143143
key: string,
144144
handler: (ctx?: NuxtAppCompat) => Promise<ResT>,
145145
options?: AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>
146-
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null>
146+
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined>
147147
export function useAsyncData<
148148
ResT,
149149
NuxtErrorDataT = unknown,
150150
DataT = ResT,
151151
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
152-
DefaultT = null,
153-
> (...args: any[]): AsyncData<PickFrom<DataT, PickKeys>, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null> {
152+
DefaultT = undefined,
153+
> (...args: any[]): AsyncData<PickFrom<DataT, PickKeys>, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined> {
154154
const autoKey = typeof args[args.length - 1] === 'string' ? args.pop() : undefined
155155
if (typeof args[0] !== 'string') { args.unshift(autoKey) }
156156

@@ -169,7 +169,7 @@ export function useAsyncData<
169169
const nuxt = useNuxtApp()
170170

171171
// Used to get default values
172-
const getDefault = () => null
172+
const getDefault = () => undefined
173173
const getDefaultCachedData = () => nuxt.isHydrating ? nuxt.payload.data[key] : nuxt.static.data[key]
174174

175175
// Apply defaults
@@ -190,7 +190,7 @@ export function useAsyncData<
190190

191191
// Create or use a shared asyncData entity
192192
if (!nuxt._asyncData[key] || !options.immediate) {
193-
nuxt.payload._errors[key] = nuxt.payload._errors[key] ?? null
193+
nuxt.payload._errors[key] = nuxt.payload._errors[key] ?? undefined
194194

195195
const _ref = options.deep ? ref : shallowRef
196196

@@ -243,7 +243,7 @@ export function useAsyncData<
243243
nuxt.payload.data[key] = result
244244

245245
asyncData.data.value = result
246-
asyncData.error.value = null
246+
asyncData.error.value = undefined
247247
asyncData.status.value = 'success'
248248
})
249249
.catch((error: any) => {
@@ -337,11 +337,11 @@ export function useLazyAsyncData<
337337
NuxtErrorDataT = unknown,
338338
DataT = ResT,
339339
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
340-
DefaultT = null,
340+
DefaultT = undefined,
341341
> (
342342
handler: (ctx?: NuxtAppCompat) => Promise<ResT>,
343343
options?: Omit<AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>, 'lazy'>
344-
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null>
344+
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined>
345345
export function useLazyAsyncData<
346346
ResT,
347347
NuxtErrorDataT = unknown,
@@ -351,18 +351,18 @@ export function useLazyAsyncData<
351351
> (
352352
handler: (ctx?: NuxtAppCompat) => Promise<ResT>,
353353
options?: Omit<AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>, 'lazy'>
354-
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null>
354+
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined>
355355
export function useLazyAsyncData<
356356
ResT,
357357
NuxtErrorDataT = unknown,
358358
DataT = ResT,
359359
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
360-
DefaultT = null,
360+
DefaultT = undefined,
361361
> (
362362
key: string,
363363
handler: (ctx?: NuxtAppCompat) => Promise<ResT>,
364364
options?: Omit<AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>, 'lazy'>
365-
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null>
365+
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined>
366366
export function useLazyAsyncData<
367367
ResT,
368368
NuxtErrorDataT = unknown,
@@ -373,15 +373,15 @@ export function useLazyAsyncData<
373373
key: string,
374374
handler: (ctx?: NuxtAppCompat) => Promise<ResT>,
375375
options?: Omit<AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>, 'lazy'>
376-
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null>
376+
): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined>
377377

378378
export function useLazyAsyncData<
379379
ResT,
380380
NuxtErrorDataT = unknown,
381381
DataT = ResT,
382382
PickKeys extends KeysOf<DataT> = KeysOf<DataT>,
383-
DefaultT = null,
384-
> (...args: any[]): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | null> {
383+
DefaultT = undefined,
384+
> (...args: any[]): AsyncData<PickFrom<DataT, PickKeys> | DefaultT, (NuxtErrorDataT extends Error | NuxtError ? NuxtErrorDataT : NuxtError<NuxtErrorDataT>) | undefined> {
385385
const autoKey = typeof args[args.length - 1] === 'string' ? args.pop() : undefined
386386
if (typeof args[0] !== 'string') { args.unshift(autoKey) }
387387
const [key, handler, options] = args as [string, (ctx?: NuxtAppCompat) => Promise<ResT>, AsyncDataOptions<ResT, DataT, PickKeys, DefaultT>]
@@ -417,12 +417,12 @@ function clearNuxtDataByKey (nuxtApp: NuxtAppCompat, key: string): void {
417417
}
418418

419419
if (key in nuxtApp.payload._errors) {
420-
nuxtApp.payload._errors[key] = null
420+
nuxtApp.payload._errors[key] = undefined
421421
}
422422

423423
if (nuxtApp._asyncData[key]) {
424424
nuxtApp._asyncData[key]!.data.value = undefined
425-
nuxtApp._asyncData[key]!.error.value = null
425+
nuxtApp._asyncData[key]!.error.value = undefined
426426
nuxtApp._asyncData[key]!.pending.value = false
427427
nuxtApp._asyncData[key]!.status.value = 'idle'
428428
}

0 commit comments

Comments
 (0)