floq 0.0.1 → 0.2.0

package/dist/config.js

@@ -1,9 +1,37 @@
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync, mkdirSync, renameSync } from 'fs';
 import { dirname, join, isAbsolute } from 'path';
 import { CONFIG_FILE, DATA_DIR } from './paths.js';
+// Migrate legacy DB file names (including related metadata files)
+function migrateDbFiles() {
+    const legacyDb = join(DATA_DIR, 'gtd.db');
+    const newDb = join(DATA_DIR, 'floq.db');
+    const legacyTursoDb = join(DATA_DIR, 'gtd-turso.db');
+    const newTursoDb = join(DATA_DIR, 'floq-turso.db');
+    // Turso/libsql related file suffixes
+    const tursoSuffixes = ['', '-info', '-shm', '-wal'];
+    try {
+        if (existsSync(legacyDb) && !existsSync(newDb)) {
+            renameSync(legacyDb, newDb);
+        }
+        // Migrate Turso DB and all related metadata files
+        for (const suffix of tursoSuffixes) {
+            const legacyFile = legacyTursoDb + suffix;
+            const newFile = newTursoDb + suffix;
+            if (existsSync(legacyFile) && !existsSync(newFile)) {
+                renameSync(legacyFile, newFile);
+            }
+        }
+    }
+    catch {
+        // Ignore migration errors
+    }
+}
+// Run DB file migration on module load
+migrateDbFiles();
 const DEFAULT_CONFIG = {
     locale: 'en',
     theme: 'modern',
+    viewMode: 'gtd',
 };
 let configCache = null;
 export function loadConfig() {
@@ -39,6 +67,16 @@ export function saveConfig(updates) {
         // Ignore errors
     }
 }
+export function getTursoConfig() {
+    return loadConfig().turso;
+}
+export function setTursoConfig(config) {
+    saveConfig({ turso: config });
+}
+export function isTursoEnabled() {
+    const turso = getTursoConfig();
+    return turso !== undefined && turso.url !== '' && turso.authToken !== '';
+}
 export function getDbPath() {
     const config = loadConfig();
     if (config.db_path) {
@@ -48,7 +86,11 @@ export function getDbPath() {
         }
         return join(DATA_DIR, config.db_path);
     }
-    return join(DATA_DIR, 'gtd.db');
+    // Turso モードでは別のDBファイルを使用（embedded replica 用）
+    if (isTursoEnabled()) {
+        return join(DATA_DIR, 'floq-turso.db');
+    }
+    return join(DATA_DIR, 'floq.db');
 }
 export function getLocale() {
     return loadConfig().locale;
@@ -62,3 +104,12 @@ export function getThemeName() {
 export function setThemeName(theme) {
     saveConfig({ theme });
 }
+export function getViewMode() {
+    return loadConfig().viewMode || 'gtd';
+}
+export function setViewMode(viewMode) {
+    saveConfig({ viewMode });
+}
+export function isFirstRun() {
+    return !existsSync(CONFIG_FILE);
+}

package/dist/db/index.d.ts

@@ -1,6 +1,7 @@
-import Database from 'better-sqlite3';
+import { drizzle } from 'drizzle-orm/libsql';
 import * as schema from './schema.js';
-export declare function getDb(): import("drizzle-orm/better-sqlite3").BetterSQLite3Database<typeof schema> & {
-    $client: Database.Database;
-};
+export type DbInstance = ReturnType<typeof drizzle<typeof schema>>;
+export declare function initDb(): Promise<void>;
+export declare function getDb(): DbInstance;
+export declare function syncDb(): Promise<void>;
 export { schema };

package/dist/db/index.js

@@ -1,45 +1,93 @@
-import Database from 'better-sqlite3';
-import { drizzle } from 'drizzle-orm/better-sqlite3';
+import { drizzle } from 'drizzle-orm/libsql';
+import { createClient } from '@libsql/client';
 import { mkdirSync, existsSync } from 'fs';
 import { dirname } from 'path';
 import * as schema from './schema.js';
-import { getDbPath } from '../config.js';
+import { getDbPath, isTursoEnabled, getTursoConfig } from '../config.js';
 function ensureDbDir(dbPath) {
     const dbDir = dirname(dbPath);
     if (!existsSync(dbDir)) {
         mkdirSync(dbDir, { recursive: true });
     }
 }
-function initializeSchema(sqlite) {
-    // Check if we need to migrate from old schema
-    const tableInfo = sqlite.prepare("PRAGMA table_info(tasks)").all();
+let client = null;
+let dbInstance = null;
+// リモート DB のスキーマを初期化
+async function initializeRemoteSchema(tursoUrl, authToken) {
+    // リモート専用クライアントでスキーマを作成
+    const remoteClient = createClient({
+        url: tursoUrl,
+        authToken: authToken,
+    });
+    try {
+        const tableInfoResult = await remoteClient.execute("PRAGMA table_info(tasks)");
+        const tableInfo = tableInfoResult.rows;
+        const tableExists = tableInfo.length > 0;
+        if (!tableExists) {
+            // Fresh install: create new schema on remote
+            await remoteClient.execute(`
+        CREATE TABLE IF NOT EXISTS tasks (
+          id TEXT PRIMARY KEY,
+          title TEXT NOT NULL,
+          description TEXT,
+          status TEXT NOT NULL DEFAULT 'inbox' CHECK(status IN ('inbox', 'next', 'waiting', 'someday', 'done')),
+          is_project INTEGER NOT NULL DEFAULT 0,
+          parent_id TEXT,
+          waiting_for TEXT,
+          due_date INTEGER,
+          created_at INTEGER NOT NULL,
+          updated_at INTEGER NOT NULL
+        )
+      `);
+            await remoteClient.execute("CREATE INDEX IF NOT EXISTS idx_tasks_status ON tasks(status)");
+            await remoteClient.execute("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)");
+            await remoteClient.execute("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)");
+        }
+        // Create comments table
+        await remoteClient.execute(`
+      CREATE TABLE IF NOT EXISTS comments (
+        id TEXT PRIMARY KEY,
+        task_id TEXT NOT NULL,
+        content TEXT NOT NULL,
+        created_at INTEGER NOT NULL
+      )
+    `);
+        await remoteClient.execute("CREATE INDEX IF NOT EXISTS idx_comments_task_id ON comments(task_id)");
+    }
+    finally {
+        remoteClient.close();
+    }
+}
+// ローカル DB のスキーマを初期化（ローカルモード用）
+async function initializeLocalSchema() {
+    if (!client)
+        return;
+    const tableInfoResult = await client.execute("PRAGMA table_info(tasks)");
+    const tableInfo = tableInfoResult.rows;
     const hasProjectId = tableInfo.some(col => col.name === 'project_id');
     const hasIsProject = tableInfo.some(col => col.name === 'is_project');
     const tableExists = tableInfo.length > 0;
     if (tableExists && hasProjectId && !hasIsProject) {
         // Migration: old schema -> new schema
-        // Add new columns
-        sqlite.prepare("ALTER TABLE tasks ADD COLUMN is_project INTEGER NOT NULL DEFAULT 0").run();
-        sqlite.prepare("ALTER TABLE tasks ADD COLUMN parent_id TEXT").run();
-        // Migrate: convert projects to tasks with is_project=1
-        const projects = sqlite.prepare("SELECT * FROM projects").all();
-        const insertStmt = sqlite.prepare(`
-      INSERT INTO tasks (id, title, description, status, is_project, parent_id, waiting_for, due_date, created_at, updated_at)
-      VALUES (?, ?, ?, ?, 1, NULL, NULL, NULL, ?, ?)
-    `);
+        await client.execute("ALTER TABLE tasks ADD COLUMN is_project INTEGER NOT NULL DEFAULT 0");
+        await client.execute("ALTER TABLE tasks ADD COLUMN parent_id TEXT");
+        const projectsResult = await client.execute("SELECT * FROM projects");
+        const projects = projectsResult.rows;
         for (const p of projects) {
             const newStatus = p.status === 'active' ? 'next' : (p.status === 'completed' ? 'done' : p.status);
-            insertStmt.run(p.id, p.name, p.description, newStatus, p.created_at, p.updated_at);
+            await client.execute({
+                sql: `INSERT INTO tasks (id, title, description, status, is_project, parent_id, waiting_for, due_date, created_at, updated_at)
+              VALUES (?, ?, ?, ?, 1, NULL, NULL, NULL, ?, ?)`,
+                args: [p.id, p.name, p.description, newStatus, p.created_at, p.updated_at]
+            });
         }
-        // Update parent_id from old project_id
-        sqlite.prepare("UPDATE tasks SET parent_id = project_id WHERE project_id IS NOT NULL").run();
-        // Create new indexes
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)").run();
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)").run();
+        await client.execute("UPDATE tasks SET parent_id = project_id WHERE project_id IS NOT NULL");
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)");
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)");
     }
     else if (!tableExists) {
         // Fresh install: create new schema
-        sqlite.prepare(`
+        await client.execute(`
       CREATE TABLE IF NOT EXISTS tasks (
         id TEXT PRIMARY KEY,
         title TEXT NOT NULL,
@@ -52,21 +100,68 @@ function initializeSchema(sqlite) {
         created_at INTEGER NOT NULL,
         updated_at INTEGER NOT NULL
       )
-    `).run();
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_status ON tasks(status)").run();
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)").run();
-        sqlite.prepare("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)").run();
+    `);
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_status ON tasks(status)");
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_parent_id ON tasks(parent_id)");
+        await client.execute("CREATE INDEX IF NOT EXISTS idx_tasks_is_project ON tasks(is_project)");
     }
+    // Create comments table
+    await client.execute(`
+    CREATE TABLE IF NOT EXISTS comments (
+      id TEXT PRIMARY KEY,
+      task_id TEXT NOT NULL,
+      content TEXT NOT NULL,
+      created_at INTEGER NOT NULL
+    )
+  `);
+    await client.execute("CREATE INDEX IF NOT EXISTS idx_comments_task_id ON comments(task_id)");
 }
-let dbInstance = null;
+// DB 初期化
+export async function initDb() {
+    if (dbInstance)
+        return;
+    const dbPath = getDbPath();
+    ensureDbDir(dbPath);
+    if (isTursoEnabled()) {
+        // Turso embedded replica モード
+        const turso = getTursoConfig();
+        // 1. まずリモートにスキーマを作成
+        await initializeRemoteSchema(turso.url, turso.authToken);
+        // 2. embedded replica クライアントを作成
+        client = createClient({
+            url: `file:${dbPath}`,
+            syncUrl: turso.url,
+            authToken: turso.authToken,
+            syncInterval: 60, // 60秒ごとに自動同期
+        });
+        // 3. 初回同期（リモートからローカルにデータをプル）
+        await client.sync();
+    }
+    else {
+        // ローカルモード（libsql でローカルファイルのみ）
+        client = createClient({
+            url: `file:${dbPath}`,
+        });
+        // ローカルモードではスキーマをローカルに作成
+        await initializeLocalSchema();
+    }
+    dbInstance = drizzle(client, { schema });
+}
+// DB インスタンス取得
 export function getDb() {
     if (!dbInstance) {
-        const dbPath = getDbPath();
-        ensureDbDir(dbPath);
-        const sqlite = new Database(dbPath);
-        initializeSchema(sqlite);
-        dbInstance = drizzle(sqlite, { schema });
+        throw new Error('Database not initialized. Call initDb() first.');
     }
     return dbInstance;
 }
+// 手動同期（Turso モード時のみ有効）
+export async function syncDb() {
+    if (!client) {
+        throw new Error('Database not initialized');
+    }
+    if (!isTursoEnabled()) {
+        throw new Error('Turso sync is not enabled');
+    }
+    await client.sync();
+}
 export { schema };

package/dist/db/schema.d.ts

@@ -190,3 +190,86 @@ export declare const tasks: import("drizzle-orm/sqlite-core").SQLiteTableWithCol
 export type Task = typeof tasks.$inferSelect;
 export type NewTask = typeof tasks.$inferInsert;
 export type TaskStatus = 'inbox' | 'next' | 'waiting' | 'someday' | 'done';
+export declare const comments: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
+    name: "comments";
+    schema: undefined;
+    columns: {
+        id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "id";
+            tableName: "comments";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        taskId: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "task_id";
+            tableName: "comments";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        content: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "content";
+            tableName: "comments";
+            dataType: "string";
+            columnType: "SQLiteText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {
+            length: number | undefined;
+        }>;
+        createdAt: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "created_at";
+            tableName: "comments";
+            dataType: "date";
+            columnType: "SQLiteTimestamp";
+            data: Date;
+            driverParam: number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    };
+    dialect: "sqlite";
+}>;
+export type Comment = typeof comments.$inferSelect;
+export type NewComment = typeof comments.$inferInsert;

package/dist/db/schema.js

@@ -11,3 +11,9 @@ export const tasks = sqliteTable('tasks', {
     createdAt: integer('created_at', { mode: 'timestamp' }).notNull(),
     updatedAt: integer('updated_at', { mode: 'timestamp' }).notNull(),
 });
+export const comments = sqliteTable('comments', {
+    id: text('id').primaryKey(),
+    taskId: text('task_id').notNull(),
+    content: text('content').notNull(),
+    createdAt: integer('created_at', { mode: 'timestamp' }).notNull(),
+});