diff --git a/apps/desktop/src/lib/orm/cmds.ts b/apps/desktop/src/lib/orm/cmds.ts index dd0bfa1..3620def 100644 --- a/apps/desktop/src/lib/orm/cmds.ts +++ b/apps/desktop/src/lib/orm/cmds.ts @@ -1,6 +1,15 @@ import * as relations from "@kksh/drizzle/relations" import * as schema from "@kksh/drizzle/schema" -import { CmdType, Ext, ExtCmd, ExtData, SearchMode, SearchModeEnum, SQLSortOrder, SQLSortOrderEnum } from "@kunkunapi/src/models" +import { + CmdType, + Ext, + ExtCmd, + ExtData, + SearchMode, + SearchModeEnum, + SQLSortOrder, + SQLSortOrderEnum +} from "@kunkunapi/src/models" import * as orm from "drizzle-orm" import type { SelectedFields } from "drizzle-orm/sqlite-core" import * as v from "valibot" @@ -243,7 +252,7 @@ export async function searchExtensionData(searchParams: { }): Promise { const fields = v.parse(v.optional(v.array(ExtDataField), []), searchParams.fields) const _fields = fields ?? [] - + // Build the select query based on fields const selectQuery: SelectedFields = { dataId: schema.extensionData.dataId, @@ -292,7 +301,9 @@ export async function searchExtensionData(searchParams: { conditions.push(orm.like(schema.extensionData.searchText, `%${searchParams.searchText}%`)) break case SearchModeEnum.FTS: - conditions.push(orm.sql`${schema.extensionDataFts.searchText} MATCH ${searchParams.searchText}`) + conditions.push( + orm.sql`${schema.extensionDataFts.searchText} MATCH ${searchParams.searchText}` + ) break } } @@ -314,20 +325,22 @@ export async function searchExtensionData(searchParams: { ? orm.asc(schema.extensionData.createdAt) : orm.desc(schema.extensionData.createdAt) : searchParams.orderByUpdatedAt - ? searchParams.orderByUpdatedAt === SQLSortOrderEnum.Asc - ? orm.asc(schema.extensionData.updatedAt) - : orm.desc(schema.extensionData.updatedAt) - : orm.asc(schema.extensionData.createdAt) // Default ordering + ? searchParams.orderByUpdatedAt === SQLSortOrderEnum.Asc + ? orm.asc(schema.extensionData.updatedAt) + : orm.desc(schema.extensionData.updatedAt) + : orm.asc(schema.extensionData.createdAt) // Default ordering ) .limit(searchParams.limit ?? 100) // Default limit .offset(searchParams.offset ?? 0) // Default offset // Execute query and convert results const results = await query.all() - return results.map((rawData) => { - // @ts-expect-error - rawData is unknown, but will be safe parsed with valibot - return convertRawExtDataToExtData(rawData) - }).filter((item): item is ExtData => item !== undefined) + return results + .map((rawData) => { + // @ts-expect-error - rawData is unknown, but will be safe parsed with valibot + return convertRawExtDataToExtData(rawData) + }) + .filter((item): item is ExtData => item !== undefined) } // export async function getNCommands(n: number): diff --git a/apps/desktop/src/routes/app/troubleshooters/orm/+page.svelte b/apps/desktop/src/routes/app/troubleshooters/orm/+page.svelte index 364ddbe..02ab38e 100644 --- a/apps/desktop/src/routes/app/troubleshooters/orm/+page.svelte +++ b/apps/desktop/src/routes/app/troubleshooters/orm/+page.svelte @@ -19,6 +19,7 @@ import * as v from "valibot" let searchText = $state("") + /* eslint-disable */ let data: any = $state(null) let inspectTitle = $state("") diff --git a/packages/drizzle/drizzle/relations.ts b/packages/drizzle/drizzle/relations.ts index 992d949..e1e2387 100644 --- a/packages/drizzle/drizzle/relations.ts +++ b/packages/drizzle/drizzle/relations.ts @@ -1,21 +1,21 @@ -import { relations } from "drizzle-orm/relations"; -import { extensions, commands, extensionData } from "./schema"; +import { relations } from "drizzle-orm/relations" +import { commands, extensionData, extensions } from "./schema" -export const commandsRelations = relations(commands, ({one}) => ({ +export const commandsRelations = relations(commands, ({ one }) => ({ extension: one(extensions, { fields: [commands.extId], references: [extensions.extId] - }), -})); + }) +})) -export const extensionsRelations = relations(extensions, ({many}) => ({ +export const extensionsRelations = relations(extensions, ({ many }) => ({ commands: many(commands), - extensionData: many(extensionData), -})); + extensionData: many(extensionData) +})) -export const extensionDataRelations = relations(extensionData, ({one}) => ({ +export const extensionDataRelations = relations(extensionData, ({ one }) => ({ extension: one(extensions, { fields: [extensionData.extId], references: [extensions.extId] - }), -})); \ No newline at end of file + }) +})) diff --git a/packages/tauri-plugins/jarvis/permissions/autogenerated/reference.md b/packages/tauri-plugins/jarvis/permissions/autogenerated/reference.md index 06546b4..ddf14e4 100644 --- a/packages/tauri-plugins/jarvis/permissions/autogenerated/reference.md +++ b/packages/tauri-plugins/jarvis/permissions/autogenerated/reference.md @@ -1,4 +1,3 @@ - ## Permission Table @@ -7,7 +6,6 @@ -
Description