Merge pull request #50 from gov4git/cleanup-lib

Centralize utility functions

.changeset/many-mails-double.md

@@ -0,0 +1,5 @@
+---
+'gov4git-desktop-app': patch
+---
+
+Centralize utility functions

.vscode/settings.json

@@ -28,4 +28,4 @@
   "files.watcherExclude": {
     "**/target": true
   },
-}
+}

package.json

@@ -86,7 +86,8 @@
     "tsup": "^8.0.1",
     "tsx": "^4.6.0",
     "typescript": "^5.3.2",
-    "vite": "^5.0.3"
+    "vite": "^5.0.3",
+    "vite-tsconfig-paths": "^4.2.1"
   },
   "dependencies": {
     "@fluentui/react-components": "^9.41.0",
@@ -109,4 +110,4 @@
     "type": "git",
     "url": "https://github.com/gov4git/desktop-application.git"
   }
-}
+}

src/electron/db/schema.ts

@@ -1,6 +1,6 @@
 import { integer, real, sqliteTable, text } from 'drizzle-orm/sqlite-core'
 
-import { type Ballot as BallotType, Config } from '~/shared'
+import { type Ballot as BallotType } from '~/shared'
 
 export const ballots = sqliteTable('ballots', {
   identifier: text('identifier').primaryKey(),

src/electron/lib/index.ts

@@ -1,4 +1,2 @@
 export * from './paths.js'
-export * from './records.js'
-export * from './error.js'
 export * from './stdout.js'

src/electron/services/AppUpdaterService.ts

@@ -62,7 +62,7 @@ export class AppUpdaterService extends AbstractAppUpdaterService {
       const updateInfo = await autoUpdater.checkForUpdates()
       if (updateInfo == null) return null
       if (updateInfo.downloadPromise != null) {
-        this.updating = updateInfo.downloadPromise.then((r) => {
+        this.updating = updateInfo.downloadPromise.then(() => {
           return {
             ready: true,
             version: updateInfo.updateInfo.version,

src/electron/services/BallotService.ts

@@ -4,6 +4,7 @@ import {
   AbstractBallotService,
   Ballot,
   CreateBallotOptions,
+  serialAsync,
   VoteOption,
 } from '~/shared'
 
@@ -294,7 +295,7 @@ export class BallotService extends AbstractBallotService {
     return this.loadBallot(user.username, community.url, ballotId)
   }
 
-  public loadBallots = async () => {
+  public loadBallots = serialAsync(async () => {
     const [userRows, communityRows] = await Promise.all([
       this.db.select().from(users).limit(1),
       this.db
@@ -328,7 +329,7 @@ export class BallotService extends AbstractBallotService {
     }
 
     await Promise.all(ballotPromises)
-  }
+  })
 
   public getBallots = async () => {
     const selectedCommunity = (

src/electron/services/LogService.ts

@@ -11,9 +11,9 @@ import { dirname, resolve } from 'node:path'
 import fastRedact from 'fast-redact'
 
 import { AbstractLogService } from '~/shared'
+import { isRecord } from '~/shared'
 
 import { toResolvedPath } from '../lib/paths.js'
-import { isRecord } from '../lib/records.js'
 
 export type Redacter = (...args: any[]) => string
 

src/electron/services/Services.ts

@@ -1,6 +1,5 @@
 import { InvokeServiceProps, ServiceId } from '~/shared'
-
-import { isRecord } from '../lib/records.js'
+import { isRecord } from '~/shared'
 
 export class Services {
   protected declare services: Record<string, unknown>

src/electron/services/UserService.ts

@@ -1,6 +1,6 @@
 import { and, eq } from 'drizzle-orm'
 
-import { AbstractUserService } from '~/shared'
+import { AbstractUserService, serialAsync } from '~/shared'
 
 import { DB } from '../db/db.js'
 import {
@@ -209,7 +209,7 @@ export class UserService extends AbstractUserService {
     return []
   }
 
-  public loadUser = async () => {
+  public loadUser = serialAsync(async () => {
     const [allUsers, selectedCommunities] = await Promise.all([
       this.db.select().from(users),
       this.db.select().from(communities).where(eq(communities.selected, true)),
@@ -271,7 +271,7 @@ export class UserService extends AbstractUserService {
       communities: community,
       userCommunities: userCommunity,
     }
-  }
+  })
 
   public getUser = async () => {
     const userInfos = (

src/renderer/src/components/BubbleSlider.tsx

@@ -7,7 +7,8 @@ import {
   useState,
 } from 'react'
 
-import { formatDecimal } from '../lib/numbers.js'
+import { formatDecimal } from '~/shared'
+
 import { useBubbleSliderStyles } from './BubbleSlider.styles.js'
 
 export type BubbleSliderProps = {

src/renderer/src/components/CreateForm.tsx

@@ -10,9 +10,10 @@ import {
 import { FormEvent, useCallback, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 
+import { createNestedRecord, mergeDeep } from '~/shared'
+
 import { routes } from '../App/index.js'
 import { useCatchError } from '../hooks/useCatchError.js'
-import { createNestedRecord, mergeDeep } from '../lib/index.js'
 import { ballotService } from '../services/BallotService.js'
 import { useButtonStyles } from '../styles/index.js'
 import { useSettingsFormsStyles } from './SettingsForm.styles.js'