fix types

This commit is contained in:
Gauthier Roebroeck 2026-01-30 16:34:19 +08:00
parent 558e1be0ee
commit cf4a51a734
4 changed files with 9 additions and 9 deletions

View file

@ -36,6 +36,6 @@ export function useRouteQuerySchema<T extends v.GenericSchema>(queryName: string
})
return {
data: data as v.InferOutput<T>,
data: data as Ref<v.InferOutput<T>>,
}
}

View file

@ -2,16 +2,16 @@ import type { SchemaFilterSeriesStatus } from '@/types/filter'
import type { InferOutput } from 'valibot'
export function schemaFilterSeriesStatusToConditions(
filter: MaybeRefOrGetter<InferOutput<typeof SchemaFilterSeriesStatus>>,
filter: InferOutput<typeof SchemaFilterSeriesStatus>,
) {
const list = toValue(filter).v.map((it) => ({
const list = filter.v.map((it) => ({
seriesStatus: {
operator: it.i === 'e' ? 'isNot' : 'is',
value: it.v,
},
}))
if (toValue(filter).m === 'allOf')
if (filter.m === 'allOf')
return {
allOf: list,
}

View file

@ -114,7 +114,7 @@ import { useSelectionStore } from '@/stores/selection'
import { useDisplay } from 'vuetify'
import { schemaFilterSeriesStatusToConditions } from '@/functions/filter'
import * as v from 'valibot'
import { SchemaFilterSeriesStatus } from '@/types/filter'
import { SchemaFilterSeriesStatus, SchemaSeriesStatus } from '@/types/filter'
import { useRouteQuerySchema } from '@/composables/useRouteQuerySchema'
const route = useRoute('/libraries/[id]/series')
@ -142,7 +142,7 @@ const { data: filter } = useRouteQuerySchema('status', SchemaFilterSeriesStatus)
const conds = computed(() => ({
allOf: [
librariesCondition.value as components['schemas']['AnyOfSeries'],
schemaFilterSeriesStatusToConditions(filter),
schemaFilterSeriesStatusToConditions(filter.value),
],
}))
@ -164,8 +164,8 @@ watch(series, (newSeries) => {
const filterStatusItems: {
title: string
value: v.InferOutput<typeof SeriesStatus>
valueExclude?: v.InferOutput<typeof SeriesStatus>
value: v.InferOutput<typeof SchemaSeriesStatus>
valueExclude?: v.InferOutput<typeof SchemaSeriesStatus>
}[] = [
{ title: 'Ended', value: { i: 'i', v: 'ENDED' }, valueExclude: { i: 'e', v: 'ENDED' } },
{ title: 'Ongoing', value: { i: 'i', v: 'ONGOING' }, valueExclude: { i: 'e', v: 'ONGOING' } },

View file

@ -8,7 +8,7 @@ export const SchemaAnyAll = v.object({
const SchemaIncludeExclude = v.object({ i: v.optional(v.picklist(['i', 'e'])) })
const SchemaSeriesStatus = v.object({
export const SchemaSeriesStatus = v.object({
...SchemaIncludeExclude.entries,
v: v.optional(v.picklist(['ENDED', 'ONGOING', 'ABANDONED', 'HIATUS'])),
})