floq 0.0.1 → 0.1.0

package/dist/ui/App.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 import { Box, Text, useInput, useApp } from 'ink';
 import TextInput from 'ink-text-input';
 import { eq, and } from 'drizzle-orm';
@@ -11,7 +11,7 @@ import { SplashScreen } from './SplashScreen.js';
 import { getDb, schema } from '../db/index.js';
 import { t, fmt } from '../i18n/index.js';
 import { ThemeProvider, useTheme } from './theme/index.js';
-import { getThemeName } from '../config.js';
+import { getThemeName, isTursoEnabled, getTursoConfig } from '../config.js';
 const TABS = ['inbox', 'next', 'waiting', 'someday', 'projects'];
 export function App() {
     const themeName = getThemeName();
@@ -37,7 +37,7 @@ function AppContent() {
     const [taskToLink, setTaskToLink] = useState(null);
     const [projectSelectIndex, setProjectSelectIndex] = useState(0);
     const i18n = t();
-    const loadTasks = () => {
+    const loadTasks = useCallback(async () => {
         const db = getDb();
         const newTasks = {
             inbox: [],
@@ -49,46 +49,43 @@ function AppContent() {
         // Load all tasks (including project children) by status
         const statusList = ['inbox', 'next', 'waiting', 'someday'];
         for (const status of statusList) {
-            newTasks[status] = db
+            newTasks[status] = await db
                 .select()
                 .from(schema.tasks)
-                .where(and(eq(schema.tasks.status, status), eq(schema.tasks.isProject, false)))
-                .all();
+                .where(and(eq(schema.tasks.status, status), eq(schema.tasks.isProject, false)));
         }
         // Load projects (isProject = true, not done)
-        newTasks.projects = db
+        newTasks.projects = await db
             .select()
             .from(schema.tasks)
-            .where(and(eq(schema.tasks.isProject, true), eq(schema.tasks.status, 'next')))
-            .all();
+            .where(and(eq(schema.tasks.isProject, true), eq(schema.tasks.status, 'next')));
         setTasks(newTasks);
-    };
+    }, []);
     // Get parent project for a task
     const getParentProject = (parentId) => {
         if (!parentId)
             return undefined;
         return tasks.projects.find(p => p.id === parentId);
     };
-    const loadProjectTasks = (projectId) => {
+    const loadProjectTasks = useCallback(async (projectId) => {
         const db = getDb();
-        const children = db
+        const children = await db
             .select()
             .from(schema.tasks)
-            .where(eq(schema.tasks.parentId, projectId))
-            .all();
+            .where(eq(schema.tasks.parentId, projectId));
         setProjectTasks(children);
-    };
+    }, []);
     useEffect(() => {
         loadTasks();
-    }, []);
+    }, [loadTasks]);
     const currentTab = TABS[currentListIndex];
     const currentTasks = mode === 'project-detail' ? projectTasks : tasks[currentTab];
-    const addTask = (title, parentId) => {
+    const addTask = useCallback(async (title, parentId) => {
         if (!title.trim())
             return;
         const db = getDb();
         const now = new Date();
-        db.insert(schema.tasks)
+        await db.insert(schema.tasks)
             .values({
             id: uuidv4(),
             title: title.trim(),
@@ -96,20 +93,19 @@ function AppContent() {
             parentId: parentId || null,
             createdAt: now,
             updatedAt: now,
-        })
-            .run();
+        });
         setMessage(fmt(i18n.tui.added, { title: title.trim() }));
-        loadTasks();
-    };
-    const handleInputSubmit = (value) => {
+        await loadTasks();
+    }, [i18n.tui.added, loadTasks]);
+    const handleInputSubmit = async (value) => {
         if (value.trim()) {
             if (mode === 'add-to-project' && selectedProject) {
-                addTask(value, selectedProject.id);
-                loadProjectTasks(selectedProject.id);
+                await addTask(value, selectedProject.id);
+                await loadProjectTasks(selectedProject.id);
                 setMode('project-detail');
             }
             else {
-                addTask(value);
+                await addTask(value);
                 setMode('normal');
             }
         }
@@ -118,15 +114,38 @@ function AppContent() {
         }
         setInputValue('');
     };
-    const linkTaskToProject = (task, project) => {
+    const linkTaskToProject = useCallback(async (task, project) => {
         const db = getDb();
-        db.update(schema.tasks)
+        await db.update(schema.tasks)
             .set({ parentId: project.id, updatedAt: new Date() })
-            .where(eq(schema.tasks.id, task.id))
-            .run();
+            .where(eq(schema.tasks.id, task.id));
         setMessage(fmt(i18n.tui.linkedToProject || 'Linked "{title}" to {project}', { title: task.title, project: project.title }));
-        loadTasks();
-    };
+        await loadTasks();
+    }, [i18n.tui.linkedToProject, loadTasks]);
+    const markTaskDone = useCallback(async (task) => {
+        const db = getDb();
+        await db.update(schema.tasks)
+            .set({ status: 'done', updatedAt: new Date() })
+            .where(eq(schema.tasks.id, task.id));
+        setMessage(fmt(i18n.tui.completed, { title: task.title }));
+        await loadTasks();
+    }, [i18n.tui.completed, loadTasks]);
+    const moveTaskToStatus = useCallback(async (task, status) => {
+        const db = getDb();
+        await db.update(schema.tasks)
+            .set({ status, waitingFor: null, updatedAt: new Date() })
+            .where(eq(schema.tasks.id, task.id));
+        setMessage(fmt(i18n.tui.movedTo, { title: task.title, status: i18n.status[status] }));
+        await loadTasks();
+    }, [i18n.tui.movedTo, i18n.status, loadTasks]);
+    const makeTaskProject = useCallback(async (task) => {
+        const db = getDb();
+        await db.update(schema.tasks)
+            .set({ isProject: true, status: 'next', updatedAt: new Date() })
+            .where(eq(schema.tasks.id, task.id));
+        setMessage(fmt(i18n.tui.madeProject || 'Made project: {title}', { title: task.title }));
+        await loadTasks();
+    }, [i18n.tui.madeProject, loadTasks]);
     const getTabLabel = (tab) => {
         switch (tab) {
             case 'inbox':
@@ -214,16 +233,11 @@ function AppContent() {
             // Mark child task as done
             if (input === 'd' && projectTasks.length > 0) {
                 const task = projectTasks[selectedTaskIndex];
-                const db = getDb();
-                db.update(schema.tasks)
-                    .set({ status: 'done', updatedAt: new Date() })
-                    .where(eq(schema.tasks.id, task.id))
-                    .run();
-                setMessage(fmt(i18n.tui.completed, { title: task.title }));
-                if (selectedProject) {
-                    loadProjectTasks(selectedProject.id);
-                }
-                loadTasks();
+                markTaskDone(task).then(() => {
+                    if (selectedProject) {
+                        loadProjectTasks(selectedProject.id);
+                    }
+                });
                 return;
             }
             return;
@@ -247,31 +261,21 @@ function AppContent() {
         if ((input === '\x1bOR' || input === '\x1b[13~') && currentTasks.length > 0) {
             // F3 - Done
             const task = currentTasks[selectedTaskIndex];
-            const db = getDb();
-            db.update(schema.tasks)
-                .set({ status: 'done', updatedAt: new Date() })
-                .where(eq(schema.tasks.id, task.id))
-                .run();
-            setMessage(fmt(i18n.tui.completed, { title: task.title }));
-            loadTasks();
-            if (selectedTaskIndex >= currentTasks.length - 1) {
-                setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
-            }
+            markTaskDone(task).then(() => {
+                if (selectedTaskIndex >= currentTasks.length - 1) {
+                    setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
+                }
+            });
             return;
         }
         if ((input === '\x1bOS' || input === '\x1b[14~') && currentTasks.length > 0 && currentTab !== 'next' && currentTab !== 'projects') {
             // F4 - Move to Next
             const task = currentTasks[selectedTaskIndex];
-            const db = getDb();
-            db.update(schema.tasks)
-                .set({ status: 'next', waitingFor: null, updatedAt: new Date() })
-                .where(eq(schema.tasks.id, task.id))
-                .run();
-            setMessage(fmt(i18n.tui.movedTo, { title: task.title, status: i18n.status.next }));
-            loadTasks();
-            if (selectedTaskIndex >= currentTasks.length - 1) {
-                setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
-            }
+            moveTaskToStatus(task, 'next').then(() => {
+                if (selectedTaskIndex >= currentTasks.length - 1) {
+                    setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
+                }
+            });
             return;
         }
         if (input === '\x1b[15~') {
@@ -358,16 +362,11 @@ function AppContent() {
         // Mark as project (p key)
         if (input === 'p' && currentTasks.length > 0 && currentTab !== 'projects') {
             const task = currentTasks[selectedTaskIndex];
-            const db = getDb();
-            db.update(schema.tasks)
-                .set({ isProject: true, status: 'next', updatedAt: new Date() })
-                .where(eq(schema.tasks.id, task.id))
-                .run();
-            setMessage(fmt(i18n.tui.madeProject || 'Made project: {title}', { title: task.title }));
-            loadTasks();
-            if (selectedTaskIndex >= currentTasks.length - 1) {
-                setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
-            }
+            makeTaskProject(task).then(() => {
+                if (selectedTaskIndex >= currentTasks.length - 1) {
+                    setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
+                }
+            });
             return;
         }
         // Link to project (P key - shift+p)
@@ -381,61 +380,41 @@ function AppContent() {
         // Mark as done
         if (input === 'd' && currentTasks.length > 0) {
             const task = currentTasks[selectedTaskIndex];
-            const db = getDb();
-            db.update(schema.tasks)
-                .set({ status: 'done', updatedAt: new Date() })
-                .where(eq(schema.tasks.id, task.id))
-                .run();
-            setMessage(fmt(i18n.tui.completed, { title: task.title }));
-            loadTasks();
-            if (selectedTaskIndex >= currentTasks.length - 1) {
-                setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
-            }
+            markTaskDone(task).then(() => {
+                if (selectedTaskIndex >= currentTasks.length - 1) {
+                    setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
+                }
+            });
             return;
         }
         // Move to next actions
         if (input === 'n' && currentTasks.length > 0 && currentTab !== 'next' && currentTab !== 'projects') {
             const task = currentTasks[selectedTaskIndex];
-            const db = getDb();
-            db.update(schema.tasks)
-                .set({ status: 'next', waitingFor: null, updatedAt: new Date() })
-                .where(eq(schema.tasks.id, task.id))
-                .run();
-            setMessage(fmt(i18n.tui.movedTo, { title: task.title, status: i18n.status.next }));
-            loadTasks();
-            if (selectedTaskIndex >= currentTasks.length - 1) {
-                setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
-            }
+            moveTaskToStatus(task, 'next').then(() => {
+                if (selectedTaskIndex >= currentTasks.length - 1) {
+                    setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
+                }
+            });
             return;
         }
         // Move to someday
         if (input === 's' && currentTasks.length > 0 && currentTab !== 'someday' && currentTab !== 'projects') {
             const task = currentTasks[selectedTaskIndex];
-            const db = getDb();
-            db.update(schema.tasks)
-                .set({ status: 'someday', waitingFor: null, updatedAt: new Date() })
-                .where(eq(schema.tasks.id, task.id))
-                .run();
-            setMessage(fmt(i18n.tui.movedTo, { title: task.title, status: i18n.status.someday }));
-            loadTasks();
-            if (selectedTaskIndex >= currentTasks.length - 1) {
-                setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
-            }
+            moveTaskToStatus(task, 'someday').then(() => {
+                if (selectedTaskIndex >= currentTasks.length - 1) {
+                    setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
+                }
+            });
             return;
         }
         // Move to inbox
         if (input === 'i' && currentTasks.length > 0 && currentTab !== 'inbox' && currentTab !== 'projects') {
             const task = currentTasks[selectedTaskIndex];
-            const db = getDb();
-            db.update(schema.tasks)
-                .set({ status: 'inbox', waitingFor: null, updatedAt: new Date() })
-                .where(eq(schema.tasks.id, task.id))
-                .run();
-            setMessage(fmt(i18n.tui.movedTo, { title: task.title, status: i18n.status.inbox }));
-            loadTasks();
-            if (selectedTaskIndex >= currentTasks.length - 1) {
-                setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
-            }
+            moveTaskToStatus(task, 'inbox').then(() => {
+                if (selectedTaskIndex >= currentTasks.length - 1) {
+                    setSelectedTaskIndex(Math.max(0, selectedTaskIndex - 1));
+                }
+            });
             return;
         }
         // Refresh
@@ -458,7 +437,21 @@ function AppContent() {
         const [open, close] = theme.style.tabBrackets;
         return `${open}${label}${close}`;
     };
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, justifyContent: "space-between", children: [_jsx(Text, { bold: true, color: theme.colors.primary, children: formatTitle(i18n.tui.title) }), _jsx(Text, { color: theme.colors.textMuted, children: i18n.tui.helpHint })] }), _jsx(Box, { marginBottom: 1, children: TABS.map((tab, index) => {
+    // Turso 接続情報を取得
+    const tursoEnabled = isTursoEnabled();
+    const tursoHost = tursoEnabled ? (() => {
+        const config = getTursoConfig();
+        if (config) {
+            try {
+                return new URL(config.url).host;
+            }
+            catch {
+                return config.url;
+            }
+        }
+        return '';
+    })() : '';
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, justifyContent: "space-between", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, color: theme.colors.primary, children: formatTitle(i18n.tui.title) }), tursoEnabled && (_jsxs(Text, { color: theme.colors.accent, children: [theme.name === 'modern' ? ' ☁️ ' : ' [SYNC] ', tursoHost] })), !tursoEnabled && (_jsx(Text, { color: theme.colors.textMuted, children: theme.name === 'modern' ? ' 💾 local' : ' [LOCAL]' }))] }), _jsx(Text, { color: theme.colors.textMuted, children: i18n.tui.helpHint })] }), _jsx(Box, { marginBottom: 1, children: TABS.map((tab, index) => {
                     const isActive = index === currentListIndex && mode !== 'project-detail';
                     const count = tasks[tab].length;
                     const label = `${index + 1}:${getTabLabel(tab)}(${count})`;

package/dist/ui/ThemeSelector.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { type ThemeName } from '../config.js';
+import type { ThemeName } from './theme/types.js';
 interface ThemeSelectorProps {
     onSelect: (theme: ThemeName) => void;
 }

package/dist/ui/ThemeSelector.js

@@ -1,17 +1,30 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { Box, Text } from 'ink';
-import { Select } from '@inkjs/ui';
+import { useState } from 'react';
+import { Box, Text, useInput } from 'ink';
 import { themes, VALID_THEMES } from './theme/themes.js';
 import { getThemeName } from '../config.js';
 export function ThemeSelector({ onSelect }) {
     const currentTheme = getThemeName();
-    const options = VALID_THEMES.map((themeName) => {
-        const theme = themes[themeName];
-        const isCurrent = themeName === currentTheme;
-        return {
-            label: `${theme.displayName}${isCurrent ? ' (current)' : ''}`,
-            value: themeName,
-        };
+    const initialIndex = VALID_THEMES.indexOf(currentTheme);
+    const [selectedIndex, setSelectedIndex] = useState(initialIndex >= 0 ? initialIndex : 0);
+    useInput((input, key) => {
+        // j or down arrow: move down
+        if (input === 'j' || key.downArrow) {
+            setSelectedIndex((prev) => (prev < VALID_THEMES.length - 1 ? prev + 1 : 0));
+        }
+        // k or up arrow: move up
+        if (input === 'k' || key.upArrow) {
+            setSelectedIndex((prev) => (prev > 0 ? prev - 1 : VALID_THEMES.length - 1));
+        }
+        // Enter: select
+        if (key.return) {
+            onSelect(VALID_THEMES[selectedIndex]);
+        }
     });
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Text, { bold: true, children: "Select a theme:" }), _jsx(Box, { marginTop: 1, children: _jsx(Select, { options: options, onChange: (value) => onSelect(value) }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Text, { bold: true, children: "Select a theme:" }), _jsx(Text, { dimColor: true, children: "j/k: select, Enter: confirm" }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: VALID_THEMES.map((themeName, index) => {
+                    const theme = themes[themeName];
+                    const isSelected = index === selectedIndex;
+                    const isCurrent = themeName === currentTheme;
+                    return (_jsx(Box, { children: _jsxs(Text, { color: isSelected ? 'cyan' : undefined, children: [isSelected ? '› ' : '  ', theme.displayName, isCurrent ? ' (current)' : ''] }) }, themeName));
+                }) })] }));
 }

package/dist/ui/components/FunctionKeyBar.d.ts

@@ -1,10 +1,11 @@
 import React from 'react';
-interface FunctionKey {
+interface ActionKey {
     key: string;
     label: string;
 }
-interface FunctionKeyBarProps {
-    keys?: FunctionKey[];
+interface ActionKeyBarProps {
+    keys?: ActionKey[];
 }
-export declare function FunctionKeyBar({ keys }: FunctionKeyBarProps): React.ReactElement;
+export declare function ActionKeyBar({ keys }: ActionKeyBarProps): React.ReactElement;
+export declare const FunctionKeyBar: typeof ActionKeyBar;
 export {};

package/dist/ui/components/FunctionKeyBar.js

@@ -1,19 +1,23 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
 import { useTheme } from '../theme/index.js';
-const DEFAULT_KEYS = [
-    { key: 'F1', label: 'Help' },
-    { key: 'F2', label: 'Add' },
-    { key: 'F3', label: 'Done' },
-    { key: 'F4', label: 'Next' },
-    { key: 'F5', label: 'Rfrsh' },
-    { key: 'F6', label: '' },
-    { key: 'F7', label: '' },
-    { key: 'F8', label: '' },
-    { key: 'F9', label: '' },
-    { key: 'F10', label: 'Quit' },
-];
-export function FunctionKeyBar({ keys = DEFAULT_KEYS }) {
+import { t } from '../../i18n/index.js';
+export function ActionKeyBar({ keys }) {
     const theme = useTheme();
-    return (_jsx(Box, { children: keys.map((fn, index) => (_jsxs(Box, { marginRight: 0, children: [_jsx(Text, { backgroundColor: theme.colors.fnKeyLabel, color: "white", bold: true, children: fn.key }), _jsx(Text, { backgroundColor: theme.colors.fnKeyText, color: "black", children: fn.label.padEnd(5, ' ') })] }, index))) }));
+    const i18n = t();
+    const kb = i18n.tui.keyBar;
+    const defaultKeys = [
+        { key: 'a', label: kb.add },
+        { key: 'd', label: kb.done },
+        { key: 'n', label: kb.next },
+        { key: 's', label: kb.someday },
+        { key: 'i', label: kb.inbox },
+        { key: 'p', label: kb.project },
+        { key: '?', label: kb.help },
+        { key: 'q', label: kb.quit },
+    ];
+    const displayKeys = keys || defaultKeys;
+    return (_jsx(Box, { children: displayKeys.map((action, index) => (_jsxs(Box, { marginRight: 1, children: [_jsxs(Text, { color: theme.colors.fnKeyLabel, bold: true, children: ["[", action.key, "]"] }), _jsx(Text, { color: theme.colors.fnKeyText, children: action.label })] }, index))) }));
 }
+// Alias for backward compatibility
+export const FunctionKeyBar = ActionKeyBar;

package/dist/ui/theme/themes.d.ts

@@ -3,6 +3,18 @@ export declare const modernTheme: Theme;
 export declare const nortonCommanderTheme: Theme;
 export declare const dosPromptTheme: Theme;
 export declare const turboPascalTheme: Theme;
+export declare const classicMacTheme: Theme;
+export declare const appleIITheme: Theme;
+export declare const commodore64Theme: Theme;
+export declare const amigaWorkbenchTheme: Theme;
+export declare const matrixTheme: Theme;
+export declare const amberCrtTheme: Theme;
+export declare const phosphorTheme: Theme;
+export declare const solarizedDarkTheme: Theme;
+export declare const solarizedLightTheme: Theme;
+export declare const synthwaveTheme: Theme;
+export declare const paperTheme: Theme;
+export declare const coffeeTheme: Theme;
 export declare const themes: Record<ThemeName, Theme>;
 export declare const VALID_THEMES: ThemeName[];
 export declare function getTheme(name: ThemeName): Theme;