feat(toolbar): Refactor toolbar and enhance functionality

.changeset/chilled-flowers-march.md

@@ -0,0 +1,5 @@
+---
+"@electric-sql/debug-toolbar": minor
+---
+
+Complete restyling of toolbar and new features (table inspector, shape inspector)

.github/workflows/toolbar_tests.yml

@@ -27,7 +27,7 @@ jobs:
  node-version: 18
  cache: pnpm
  - run: make deps
- - run: pnpm run check-styleguide
+ - run: make check_styleguide
  check_types:
  name: Check types
  runs-on: ubuntu-latest
@@ -41,7 +41,7 @@ jobs:
  node-version: 18
  cache: pnpm
  - run: make deps
- - run: pnpm run typecheck
+ - run: make check_types
  test:
  runs-on: ubuntu-latest
  strategy:

clients/typescript/src/drivers/expo-sqlite/mock.ts

@@ -1,5 +1,5 @@
 import { Row } from '../../util/types'
-import { Query, ResultSet, SQLiteCallback } from 'expo-sqlite/src/SQLite.types'
+import { type Query, type ResultSet, type SQLiteCallback } from 'expo-sqlite'
 import { Database } from './database'
 
 export class MockDatabase implements Database {

components/toolbar/.eslintrc.cjs

@@ -0,0 +1,20 @@
+module.exports = {
+ parser: '@typescript-eslint/parser', // Specifies the ESLint parser
+ extends: [
+ 'plugin:react/recommended', // Uses the recommended rules from @eslint-plugin-react
+ 'plugin:@typescript-eslint/recommended', // Uses the recommended rules from @typescript-eslint/eslint-plugin
+ ],
+ parserOptions: {
+ ecmaVersion: 2018,
+ sourceType: 'module',
+ ecmaFeatures: {
+ jsx: true,
+ },
+ },
+ rules: {},
+ settings: {
+ react: {
+ version: 'detect',
+ },
+ },
+}

components/toolbar/Makefile

@@ -2,8 +2,15 @@ deps:
  pnpm install --frozen-lockfile
  make -C ../../clients/typescript build
 
-build: deps
+build:
+ deps
  pnpm run build
 
+check_types:
+ pnpm run typecheck
+
+check_styleguide:
+ pnpm run check-styleguide
+
 tests:
  CI=true pnpm run test

components/toolbar/package.json

@@ -3,38 +3,50 @@
  "version": "1.0.2",
  "type": "module",
  "main": "dist/index.cjs.js",
- "module": "dist/index.esm.js",
+ "module": "dist/index.js",
  "types": "dist/index.d.ts",
  "author": "ElectricSQL",
  "license": "Apache-2.0",
  "scripts": {
- "build": "rm -rf ./dist && node builder.js && tsc -p tsconfig.build.json",
- "check-styleguide": "prettier --check --loglevel warn .",
+ "build": "rm -rf ./dist && vite build && tsc -p tsconfig.build.json",
+ "check-styleguide": "prettier --check --loglevel warn . && eslint src --quiet",
  "typecheck": "tsc --noEmit",
+ "prepublishOnly": "pnpm build",
  "test": "vitest run"
  },
  "engines": {
  "node": ">=16.11.0"
  },
  "dependencies": {
+ "@glideapps/glide-data-grid": "^6.0.4-alpha8",
+ "@radix-ui/themes": "^3.0.3",
+ "clsx": "^2.1.1",
  "codemirror": "^5.65.16",
- "react": "^18.2.0",
+ "lodash": "^4.17.21",
+ "marked": "^4.0.10",
+ "react": "^18.3.1",
  "react-codemirror2": "^8.0.0",
- "react-dom": "^18.2.0"
+ "react-dom": "^18.3.1",
+ "react-responsive-carousel": "^3.2.23",
+ "sql-formatter": "^15.3.1"
  },
  "devDependencies": {
  "@types/better-sqlite3": "7.6.3",
  "@types/node": "^20.12.7",
- "@types/react": "^18.2.0",
- "@types/react-dom": "^18.2.0",
+ "@types/react": "^18.3.1",
+ "@types/react-dom": "^18.3.0",
+ "@typescript-eslint/eslint-plugin": "^7.8.0",
+ "@typescript-eslint/parser": "^7.8.0",
+ "@vitejs/plugin-react": "^4.2.1",
  "better-sqlite3": "^8.4.0",
  "electric-sql": "workspace:*",
- "esbuild": "^0.20.2",
- "esbuild-plugin-inline-image": "^0.0.9",
- "esbuild-plugin-inline-import": "^1.0.4",
+ "eslint": "^8.22.0",
+ "eslint-plugin-react": "^7.34.1",
  "jsdom": "24.0.0",
  "prettier": "3.2.5",
  "typescript": "^5.4.5",
+ "vite": "^5.2.10",
+ "vite-plugin-css-injected-by-js": "^3.5.1",
  "vitest": "^1.5.0"
  },
  "peerDependencies": {

components/toolbar/src/api/interface.ts

@@ -1,7 +1,21 @@
+import { Shape } from 'electric-sql/satellite'
 import { Row, Statement, ConnectivityState } from 'electric-sql/util'
 
 export type UnsubscribeFunction = () => void
 
+export type DebugShape = Shape & { id: string }
+
+export interface TableColumn {
+ name: string
+ type: 'NULL' | 'INTEGER' | 'REAL' | 'TEXT' | 'BLOB'
+}
+
+export interface DbTableInfo {
+ name: string
+ sql: string
+ columns: TableColumn[]
+}
+
 export interface ToolbarInterface {
  getSatelliteNames(): string[]
  getSatelliteStatus(name: string): ConnectivityState | null
@@ -12,8 +26,17 @@ export interface ToolbarInterface {
 
  toggleSatelliteStatus(name: string): Promise<void>
 
- getSatelliteShapeSubscriptions(name: string): string[]
+ getSatelliteShapeSubscriptions(name: string): DebugShape[]
 
  resetDb(dbName: string): Promise<void>
  queryDb(dbName: string, statement: Statement): Promise<Row[]>
+
+ getDbTables(dbName: string): Promise<DbTableInfo[]>
+ getElectricTables(dbName: string): Promise<DbTableInfo[]>
+
+ subscribeToDbTable(
+ dbName: string,
+ tableName: string,
+ callback: () => void,
+ ): UnsubscribeFunction
 }

components/toolbar/src/api/toolbar.ts

@@ -1,6 +1,17 @@
-import { ToolbarInterface, UnsubscribeFunction } from './interface'
+import {
+ DbTableInfo,
+ DebugShape,
+ TableColumn,
+ ToolbarInterface,
+ UnsubscribeFunction,
+} from './interface'
 import { Row, Statement, ConnectivityState } from 'electric-sql/util'
-import { Registry, GlobalRegistry, Satellite } from 'electric-sql/satellite'
+import {
+ Registry,
+ GlobalRegistry,
+ Satellite,
+ Shape,
+} from 'electric-sql/satellite'
 import { SubscriptionsManager } from 'electric-sql/satellite/shapes'
 
 export class Toolbar implements ToolbarInterface {
@@ -48,15 +59,19 @@ export class Toolbar implements ToolbarInterface {
  return sat.connectWithBackoff()
  }
 
- getSatelliteShapeSubscriptions(name: string): string[] {
+ getSatelliteShapeSubscriptions(name: string): DebugShape[] {
  const sat = this.getSatellite(name)
  //@ts-expect-error accessing private field
  const manager = sat['subscriptions'] as SubscriptionsManager
- const shapes = JSON.parse(manager.serialize()) as Record<string, any>
+ const shapes = JSON.parse(manager.serialize()) as Record<
+ string,
+ { definition: Shape }[]
+ >
  return Object.entries(shapes).flatMap((shapeKeyDef) =>
- shapeKeyDef[1].map((x: any) =>
- JSON.stringify({ id: shapeKeyDef[0], ...x.definition }, null, 2),
- ),
+ shapeKeyDef[1].map((x) => ({
+ id: shapeKeyDef[0],
+ ...x.definition,
+ })),
  )
  }
 
@@ -76,4 +91,74 @@ export class Toolbar implements ToolbarInterface {
  const sat = this.getSatellite(dbName)
  return sat.adapter.query(statement)
  }
+
+ async getDbTables(dbName: string): Promise<DbTableInfo[]> {
+ const adapter = this.getSatellite(dbName).adapter
+ const tables = (await adapter.query({
+ sql: `
+ SELECT name, sql FROM sqlite_master WHERE type='table'
+ AND name NOT LIKE 'sqlite_%'
+ AND name NOT LIKE '_electric_%'`,
+ })) as unknown as Omit<DbTableInfo, 'columns'>[]
+
+ return Promise.all(
+ tables.map(async (tbl) => ({
+ ...tbl,
+ columns: await this.getTableColumns(dbName, tbl.name),
+ })),
+ )
+ }
+
+ async getElectricTables(dbName: string): Promise<DbTableInfo[]> {
+ const adapter = this.getSatellite(dbName).adapter
+ const tables = (await adapter.query({
+ sql: `
+ SELECT name, sql FROM sqlite_master WHERE type='table'
+ AND name LIKE '_electric_%'`,
+ })) as unknown as Omit<DbTableInfo, 'columns'>[]
+
+ return Promise.all(
+ tables.map(async (tbl) => ({
+ ...tbl,
+ columns: await this.getTableColumns(dbName, tbl.name),
+ })),
+ )
+ }
+
+ subscribeToDbTable(
+ dbName: string,
+ tableName: string,
+ callback: () => void,
+ ): UnsubscribeFunction {
+ const sat = this.getSatellite(dbName)
+ const unsubscribe = sat.notifier.subscribeToDataChanges((notification) => {
+ if (notification.dbName !== dbName) return
+ for (const change of notification.changes) {
+ if (
+ change.qualifiedTablename.tablename === tableName ||
+ // always trigger an update if subscribing to internal tables
+ tableName.startsWith('_electric')
+ ) {
+ callback()
+ return
+ }
+ }
+ })
+
+ return unsubscribe
+ }
+
+ private async getTableColumns(
+ dbName: string,
+ tableName: string,
+ ): Promise<TableColumn[]> {
+ const adapter = this.getSatellite(dbName).adapter
+ const columns = await adapter.query({
+ sql: `PRAGMA table_info(${tableName})`,
+ })
+ return columns.map((c) => ({
+ name: c.name,
+ type: c.type,
+ })) as TableColumn[]
+ }
 }