add more typesafty

src-tauri/database/schemas/crdt.ts

@@ -2,18 +2,24 @@ import { integer, sqliteTable, text, index } from 'drizzle-orm/sqlite-core'
 import tableNames from '../tableNames.json'
 
 export const haexCrdtLogs = sqliteTable(
-  tableNames.haex.crdt.logs,
+  tableNames.haex.crdt.logs.name,
   {
     id: text()
       .primaryKey()
       .$defaultFn(() => crypto.randomUUID()),
-    haexTimestamp: text('haex_timestamp'),
-    tableName: text('table_name'),
-    rowPks: text('row_pks', { mode: 'json' }),
-    opType: text('op_type', { enum: ['INSERT', 'UPDATE', 'DELETE'] }),
-    columnName: text('column_name'),
-    newValue: text('new_value', { mode: 'json' }),
-    oldValue: text('old_value', { mode: 'json' }),
+    haexTimestamp: text(tableNames.haex.crdt.logs.columns.haexTimestamp),
+    tableName: text(tableNames.haex.crdt.logs.columns.tableName),
+    rowPks: text(tableNames.haex.crdt.logs.columns.rowPks, { mode: 'json' }),
+    opType: text(tableNames.haex.crdt.logs.columns.opType, {
+      enum: ['INSERT', 'UPDATE', 'DELETE'],
+    }),
+    columnName: text(tableNames.haex.crdt.logs.columns.columnName),
+    newValue: text(tableNames.haex.crdt.logs.columns.newValue, {
+      mode: 'json',
+    }),
+    oldValue: text(tableNames.haex.crdt.logs.columns.oldValue, {
+      mode: 'json',
+    }),
   },
   (table) => [
     index('idx_haex_timestamp').on(table.haexTimestamp),
@@ -23,17 +29,22 @@ export const haexCrdtLogs = sqliteTable(
 export type InsertHaexCrdtLogs = typeof haexCrdtLogs.$inferInsert
 export type SelectHaexCrdtLogs = typeof haexCrdtLogs.$inferSelect
 
-export const haexCrdtSnapshots = sqliteTable(tableNames.haex.crdt.snapshots, {
-  snapshot_id: text()
-    .primaryKey()
-    .$defaultFn(() => crypto.randomUUID()),
-  created: text(),
-  epoch_hlc: text(),
-  location_url: text(),
-  file_size_bytes: integer(),
-})
+export const haexCrdtSnapshots = sqliteTable(
+  tableNames.haex.crdt.snapshots.name,
+  {
+    snapshotId: text(tableNames.haex.crdt.snapshots.columns.snapshotId)
+      .primaryKey()
+      .$defaultFn(() => crypto.randomUUID()),
+    created: text(),
+    epochHlc: text(tableNames.haex.crdt.snapshots.columns.epochHlc),
+    locationUrl: text(tableNames.haex.crdt.snapshots.columns.locationUrl),
+    fileSizeBytes: integer(
+      tableNames.haex.crdt.snapshots.columns.fileSizeBytes,
+    ),
+  },
+)
 
-export const haexCrdtConfigs = sqliteTable(tableNames.haex.crdt.configs, {
+export const haexCrdtConfigs = sqliteTable(tableNames.haex.crdt.configs.name, {
   key: text()
     .primaryKey()
     .$defaultFn(() => crypto.randomUUID()),

src-tauri/database/schemas/haex.ts

@@ -8,20 +8,22 @@ import {
 } from 'drizzle-orm/sqlite-core'
 import tableNames from '../tableNames.json'
 
-export const haexSettings = sqliteTable(tableNames.haex.settings, {
+export const haexSettings = sqliteTable(tableNames.haex.settings.name, {
   id: text()
     .primaryKey()
     .$defaultFn(() => crypto.randomUUID()),
   key: text(),
   type: text(),
   value: text(),
-  haexTombstone: integer('haex_tombstone', { mode: 'boolean' }),
-  haexTimestamp: text('haex_timestamp'),
+  haexTombstone: integer(tableNames.haex.settings.columns.haexTombstone, {
+    mode: 'boolean',
+  }),
+  haexTimestamp: text(tableNames.haex.settings.columns.haexTimestamp),
 })
 export type InsertHaexSettings = typeof haexSettings.$inferInsert
 export type SelectHaexSettings = typeof haexSettings.$inferSelect
 
-export const haexExtensions = sqliteTable(tableNames.haex.extensions, {
+export const haexExtensions = sqliteTable(tableNames.haex.extensions.name, {
   id: text()
     .primaryKey()
     .$defaultFn(() => crypto.randomUUID()),
@@ -36,21 +38,23 @@ export const haexExtensions = sqliteTable(tableNames.haex.extensions, {
   signature: text(),
   url: text(),
   version: text(),
-  haexTombstone: integer('haex_tombstone', { mode: 'boolean' }),
-  haexTimestamp: text('haex_timestamp'),
+  haexTombstone: integer(tableNames.haex.extensions.columns.haexTombstone, {
+    mode: 'boolean',
+  }),
+  haexTimestamp: text(tableNames.haex.extensions.columns.haexTimestamp),
 })
 export type InsertHaexExtensions = typeof haexExtensions.$inferInsert
 export type SelectHaexExtensions = typeof haexExtensions.$inferSelect
 
 export const haexExtensionPermissions = sqliteTable(
-  tableNames.haex.extension_permissions,
+  tableNames.haex.extension_permissions.name,
   {
     id: text()
       .primaryKey()
       .$defaultFn(() => crypto.randomUUID()),
-    extensionId: text('extension_id').references(
-      (): AnySQLiteColumn => haexExtensions.id,
-    ),
+    extensionId: text(
+      tableNames.haex.extension_permissions.columns.extensionId,
+    ).references((): AnySQLiteColumn => haexExtensions.id),
     resourceType: text('resource_type', {
       enum: ['fs', 'http', 'db', 'shell'],
     }),
@@ -64,8 +68,13 @@ export const haexExtensionPermissions = sqliteTable(
     updateAt: integer('updated_at', { mode: 'timestamp' }).$onUpdate(
       () => new Date(),
     ),
-    haexTombstone: integer('haex_tombstone', { mode: 'boolean' }),
-    haexTimestamp: text('haex_timestamp'),
+    haexTombstone: integer(
+      tableNames.haex.extension_permissions.columns.haexTombstone,
+      { mode: 'boolean' },
+    ),
+    haexTimestamp: text(
+      tableNames.haex.extension_permissions.columns.haexTimestamp,
+    ),
   },
   (table) => [
     unique().on(
@@ -80,3 +89,28 @@ export type InserthaexExtensionPermissions =
   typeof haexExtensionPermissions.$inferInsert
 export type SelecthaexExtensionPermissions =
   typeof haexExtensionPermissions.$inferSelect
+
+export const haexNotifications = sqliteTable(
+  tableNames.haex.notifications.name,
+  {
+    id: text().primaryKey(),
+    alt: text(),
+    date: text(),
+    icon: text(),
+    image: text(),
+    read: integer({ mode: 'boolean' }),
+    source: text(),
+    text: text(),
+    title: text(),
+    type: text({
+      enum: ['error', 'success', 'warning', 'info', 'log'],
+    }).notNull(),
+    haexTombstone: integer(
+      tableNames.haex.notifications.columns.haexTombstone,
+      { mode: 'boolean' },
+    ),
+    haexTimestamp: text(tableNames.haex.notifications.columns.haexTimestamp),
+  },
+)
+export type InsertHaexNotifications = typeof haexNotifications.$inferInsert
+export type SelectHaexNotifications = typeof haexNotifications.$inferSelect

src-tauri/database/schemas/vault.ts

@@ -8,24 +8,6 @@ import {
 } from 'drizzle-orm/sqlite-core'
 import tableNames from '../tableNames.json'
 
-export const haexNotifications = sqliteTable(tableNames.haex.notifications, {
-  id: text().primaryKey(),
-  alt: text(),
-  date: text(),
-  icon: text(),
-  image: text(),
-  read: integer({ mode: 'boolean' }),
-  source: text(),
-  text: text(),
-  title: text(),
-  type: text({
-    enum: ['error', 'success', 'warning', 'info', 'log'],
-  }).notNull(),
-  haex_tombstone: integer({ mode: 'boolean' }),
-})
-export type InsertHaexNotifications = typeof haexNotifications.$inferInsert
-export type SelectHaexNotifications = typeof haexNotifications.$inferSelect
-
 export const haexPasswordsItemDetails = sqliteTable(
   tableNames.haex.passwords.item_details,
   {