Skip to content

Commit 5d5cbcd

Browse files
committed
Refactor ORM commands and searchExtensionData function for improved readability and consistency
- Reformatted import statements for better organization. - Cleaned up whitespace and indentation in searchExtensionData function. - Enhanced readability of SQL conditions and query building logic. - Disabled eslint for explicit any usage in the troubleshooters page.
1 parent 288c9b5 commit 5d5cbcd

File tree

4 files changed

+36
-24
lines changed

4 files changed

+36
-24
lines changed

apps/desktop/src/lib/orm/cmds.ts

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
import * as relations from "@kksh/drizzle/relations"
22
import * as schema from "@kksh/drizzle/schema"
3-
import { CmdType, Ext, ExtCmd, ExtData, SearchMode, SearchModeEnum, SQLSortOrder, SQLSortOrderEnum } from "@kunkunapi/src/models"
3+
import {
4+
CmdType,
5+
Ext,
6+
ExtCmd,
7+
ExtData,
8+
SearchMode,
9+
SearchModeEnum,
10+
SQLSortOrder,
11+
SQLSortOrderEnum
12+
} from "@kunkunapi/src/models"
413
import * as orm from "drizzle-orm"
514
import type { SelectedFields } from "drizzle-orm/sqlite-core"
615
import * as v from "valibot"
@@ -243,7 +252,7 @@ export async function searchExtensionData(searchParams: {
243252
}): Promise<ExtData[]> {
244253
const fields = v.parse(v.optional(v.array(ExtDataField), []), searchParams.fields)
245254
const _fields = fields ?? []
246-
255+
247256
// Build the select query based on fields
248257
const selectQuery: SelectedFields = {
249258
dataId: schema.extensionData.dataId,
@@ -292,7 +301,9 @@ export async function searchExtensionData(searchParams: {
292301
conditions.push(orm.like(schema.extensionData.searchText, `%${searchParams.searchText}%`))
293302
break
294303
case SearchModeEnum.FTS:
295-
conditions.push(orm.sql`${schema.extensionDataFts.searchText} MATCH ${searchParams.searchText}`)
304+
conditions.push(
305+
orm.sql`${schema.extensionDataFts.searchText} MATCH ${searchParams.searchText}`
306+
)
296307
break
297308
}
298309
}
@@ -314,20 +325,22 @@ export async function searchExtensionData(searchParams: {
314325
? orm.asc(schema.extensionData.createdAt)
315326
: orm.desc(schema.extensionData.createdAt)
316327
: searchParams.orderByUpdatedAt
317-
? searchParams.orderByUpdatedAt === SQLSortOrderEnum.Asc
318-
? orm.asc(schema.extensionData.updatedAt)
319-
: orm.desc(schema.extensionData.updatedAt)
320-
: orm.asc(schema.extensionData.createdAt) // Default ordering
328+
? searchParams.orderByUpdatedAt === SQLSortOrderEnum.Asc
329+
? orm.asc(schema.extensionData.updatedAt)
330+
: orm.desc(schema.extensionData.updatedAt)
331+
: orm.asc(schema.extensionData.createdAt) // Default ordering
321332
)
322333
.limit(searchParams.limit ?? 100) // Default limit
323334
.offset(searchParams.offset ?? 0) // Default offset
324335

325336
// Execute query and convert results
326337
const results = await query.all()
327-
return results.map((rawData) => {
328-
// @ts-expect-error - rawData is unknown, but will be safe parsed with valibot
329-
return convertRawExtDataToExtData(rawData)
330-
}).filter((item): item is ExtData => item !== undefined)
338+
return results
339+
.map((rawData) => {
340+
// @ts-expect-error - rawData is unknown, but will be safe parsed with valibot
341+
return convertRawExtDataToExtData(rawData)
342+
})
343+
.filter((item): item is ExtData => item !== undefined)
331344
}
332345

333346
// export async function getNCommands(n: number):

apps/desktop/src/routes/app/troubleshooters/orm/+page.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import * as v from "valibot"
2020
2121
let searchText = $state("")
22+
/* eslint-disable */
2223
let data: any = $state(null)
2324
let inspectTitle = $state("")
2425
</script>
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import { relations } from "drizzle-orm/relations";
2-
import { extensions, commands, extensionData } from "./schema";
1+
import { relations } from "drizzle-orm/relations"
2+
import { commands, extensionData, extensions } from "./schema"
33

4-
export const commandsRelations = relations(commands, ({one}) => ({
4+
export const commandsRelations = relations(commands, ({ one }) => ({
55
extension: one(extensions, {
66
fields: [commands.extId],
77
references: [extensions.extId]
8-
}),
9-
}));
8+
})
9+
}))
1010

11-
export const extensionsRelations = relations(extensions, ({many}) => ({
11+
export const extensionsRelations = relations(extensions, ({ many }) => ({
1212
commands: many(commands),
13-
extensionData: many(extensionData),
14-
}));
13+
extensionData: many(extensionData)
14+
}))
1515

16-
export const extensionDataRelations = relations(extensionData, ({one}) => ({
16+
export const extensionDataRelations = relations(extensionData, ({ one }) => ({
1717
extension: one(extensions, {
1818
fields: [extensionData.extId],
1919
references: [extensions.extId]
20-
}),
21-
}));
20+
})
21+
}))

packages/tauri-plugins/jarvis/permissions/autogenerated/reference.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
## Permission Table
32

43
<table>
@@ -7,7 +6,6 @@
76
<th>Description</th>
87
</tr>
98

10-
119
<tr>
1210
<td>
1311

0 commit comments

Comments
 (0)