diff --git a/src/db-types.ts b/src/db-types.ts index 078ad28..24e0e9a 100644 --- a/src/db-types.ts +++ b/src/db-types.ts @@ -38,20 +38,29 @@ export interface Word { key: string; value: string; tags: string; - more: string | null; + more: Map; group_id: number; } export async function wordList() { let rows = await query("SELECT id, key, value, tags, more, group_id FROM words"); - return rows.map((row: any) => ({ + + return rows.map((row: any) => { + let more : string = row.more.split(''); + let dict = new Map(); + for (let i = 0; i < more.length / 2; i++) { + dict.set(more[i * 2], more[i * 2 + 1]); + } + let w = { id: row.id, key: row.key, value: row.value, tags: row.tags, - more: row.more, + more: dict, group_id: row.group_id, - })) as Word[]; + } + return w; + }) as Word[]; } export interface HistoryEntry {