@bobfrankston/mailx 1.0.378 → 1.0.382

package/packages/mailx-store-web/db.js

@@ -109,6 +109,60 @@ const SCHEMA = `
         last_error TEXT,
         UNIQUE(account_id, action, uid, folder_id)
     );
+
+    -- Calendar events two-way cache (Android parity with desktop's
+    -- packages/mailx-store/db.ts calendar_events table). uuid = stable
+    -- local identity, provider_id = Google Calendar event id when known,
+    -- dirty = local edit not yet pushed, deleted = tombstone pending delete.
+    CREATE TABLE IF NOT EXISTS calendar_events (
+        uuid TEXT PRIMARY KEY,
+        account_id TEXT NOT NULL,
+        provider_id TEXT,
+        calendar_id TEXT DEFAULT 'primary',
+        title TEXT NOT NULL DEFAULT '',
+        start_ms INTEGER NOT NULL,
+        end_ms INTEGER NOT NULL,
+        all_day INTEGER DEFAULT 0,
+        location TEXT DEFAULT '',
+        notes TEXT DEFAULT '',
+        etag TEXT,
+        last_synced INTEGER DEFAULT 0,
+        dirty INTEGER DEFAULT 0,
+        deleted INTEGER DEFAULT 0,
+        updated_at INTEGER NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_calendar_events_start ON calendar_events(account_id, start_ms);
+
+    CREATE TABLE IF NOT EXISTS tasks (
+        uuid TEXT PRIMARY KEY,
+        account_id TEXT NOT NULL,
+        provider_id TEXT,
+        list_id TEXT DEFAULT '@default',
+        title TEXT NOT NULL DEFAULT '',
+        notes TEXT DEFAULT '',
+        due_ms INTEGER,
+        completed_ms INTEGER,
+        etag TEXT,
+        last_synced INTEGER DEFAULT 0,
+        dirty INTEGER DEFAULT 0,
+        deleted INTEGER DEFAULT 0,
+        updated_at INTEGER NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_tasks_account ON tasks(account_id);
+
+    -- Generic store-sync queue for non-message domains (calendar/tasks/contacts).
+    CREATE TABLE IF NOT EXISTS store_sync (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        kind TEXT NOT NULL,
+        op TEXT NOT NULL,
+        account_id TEXT NOT NULL,
+        target_uuid TEXT NOT NULL,
+        payload TEXT,
+        attempts INTEGER DEFAULT 0,
+        last_error TEXT,
+        created_at INTEGER NOT NULL,
+        UNIQUE(kind, target_uuid, op)
+    );
 `;
 const IDB_NAME = "mailx-sqldb";
 const IDB_STORE = "database";

package/packages/mailx-store-web/web-service.js

@@ -311,21 +311,30 @@ export class WebMailxService {
     }
     async syncAccount(accountId) {
         const folders = await this.syncManager.syncFolders(accountId);
-        const sorted = [...folders].sort((a, b) => {
-            if (a.specialUse === "inbox")
-                return -1;
-            if (b.specialUse === "inbox")
-                return 1;
-            return 0;
-        });
-        for (const folder of sorted) {
+        // INBOX-first: await INBOX so the UI re-renders new mail immediately,
+        // then fire the rest in the background so labels don't block the
+        // list. S57 (Android parity with desktop's local-first rule).
+        const inbox = folders.find(f => f.specialUse === "inbox");
+        const others = folders.filter(f => f.specialUse !== "inbox");
+        if (inbox) {
             try {
-                await this.syncManager.syncFolder(accountId, folder.id);
+                await this.syncManager.syncFolder(accountId, inbox.id);
             }
             catch (e) {
-                console.error(`  Skipping folder ${folder.path}: ${e.message}`);
+                console.error(`  Skipping INBOX ${inbox.path}: ${e.message}`);
             }
         }
+        // Background fan-out: don't await; errors log. UI already has INBOX.
+        (async () => {
+            for (const folder of others) {
+                try {
+                    await this.syncManager.syncFolder(accountId, folder.id);
+                }
+                catch (e) {
+                    console.error(`  Skipping folder ${folder.path}: ${e.message}`);
+                }
+            }
+        })().catch(() => { });
     }
     async reauthenticate(accountId) {
         return this.syncManager.reauthenticate(accountId);

package/packages/mailx-types/index.d.ts

@@ -278,10 +278,22 @@ export declare function sanitizeHtml(html: string): {
 /** Encode text as RFC 2045 quoted-printable. */
 export declare function encodeQuotedPrintable(text: string): string;
 /** Parse search query into structured conditions.
- *  Supports qualifiers: from:, to:, subject: (unqualified terms search everything).
- *  Returns { conditions, params } for SQL WHERE clause with LIKE. */
+ *  Supports qualifiers: from:, to:, subject:, date:, has:attachment,
+ *  is:flagged, is:unread, is:read. Unqualified terms search across subject /
+ *  from / preview. Returns { conditions, params } for SQL WHERE clause with
+ *  LIKE plus structured predicates (flags_json LIKE, has_attachments=1, date
+ *  range comparisons).
+ *
+ *  Date syntax (matches Gmail-ish conventions):
+ *    - date:2026-04-22         exact day
+ *    - date:2026-04            month
+ *    - date:>2026-04-01        after
+ *    - date:<2026-04-01        before
+ *    - date:2026-04-01..2026-04-30   range
+ *    - date:today / yesterday / last7 / last30
+ */
 export declare function parseSearchQuery(query: string): {
     conditions: string[];
-    params: string[];
+    params: (string | number)[];
 };
 //# sourceMappingURL=index.d.ts.map

package/packages/mailx-types/index.js

@@ -66,16 +66,68 @@ export function encodeQuotedPrintable(text) {
     return result;
 }
 /** Parse search query into structured conditions.
- *  Supports qualifiers: from:, to:, subject: (unqualified terms search everything).
- *  Returns { conditions, params } for SQL WHERE clause with LIKE. */
+ *  Supports qualifiers: from:, to:, subject:, date:, has:attachment,
+ *  is:flagged, is:unread, is:read. Unqualified terms search across subject /
+ *  from / preview. Returns { conditions, params } for SQL WHERE clause with
+ *  LIKE plus structured predicates (flags_json LIKE, has_attachments=1, date
+ *  range comparisons).
+ *
+ *  Date syntax (matches Gmail-ish conventions):
+ *    - date:2026-04-22         exact day
+ *    - date:2026-04            month
+ *    - date:>2026-04-01        after
+ *    - date:<2026-04-01        before
+ *    - date:2026-04-01..2026-04-30   range
+ *    - date:today / yesterday / last7 / last30
+ */
 export function parseSearchQuery(query) {
     const parts = query.match(/(?:[^\s"]+|"[^"]*")+/g) || [];
     const conditions = [];
     const params = [];
+    const dayStart = (y, m, d) => new Date(y, m - 1, d).getTime();
+    const parseDateSpec = (spec) => {
+        const now = new Date();
+        const today0 = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime();
+        if (spec === "today")
+            return { from: today0, to: today0 + 86400_000 };
+        if (spec === "yesterday")
+            return { from: today0 - 86400_000, to: today0 };
+        const lastN = spec.match(/^last(\d+)$/i);
+        if (lastN)
+            return { from: today0 - parseInt(lastN[1]) * 86400_000 };
+        const rangeMatch = spec.match(/^(\d{4})-(\d{2})-(\d{2})\.\.(\d{4})-(\d{2})-(\d{2})$/);
+        if (rangeMatch)
+            return {
+                from: dayStart(+rangeMatch[1], +rangeMatch[2], +rangeMatch[3]),
+                to: dayStart(+rangeMatch[4], +rangeMatch[5], +rangeMatch[6]) + 86400_000,
+            };
+        const gtMatch = spec.match(/^>(\d{4})-(\d{2})-(\d{2})$/);
+        if (gtMatch)
+            return { from: dayStart(+gtMatch[1], +gtMatch[2], +gtMatch[3]) + 86400_000 };
+        const ltMatch = spec.match(/^<(\d{4})-(\d{2})-(\d{2})$/);
+        if (ltMatch)
+            return { to: dayStart(+ltMatch[1], +ltMatch[2], +ltMatch[3]) };
+        const monthMatch = spec.match(/^(\d{4})-(\d{2})$/);
+        if (monthMatch) {
+            const y = +monthMatch[1], m = +monthMatch[2];
+            const from = dayStart(y, m, 1);
+            const to = m === 12 ? dayStart(y + 1, 1, 1) : dayStart(y, m + 1, 1);
+            return { from, to };
+        }
+        const dayMatch = spec.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+        if (dayMatch) {
+            const from = dayStart(+dayMatch[1], +dayMatch[2], +dayMatch[3]);
+            return { from, to: from + 86400_000 };
+        }
+        return null;
+    };
     for (const part of parts) {
         const fromMatch = part.match(/^from:(.+)$/i);
         const toMatch = part.match(/^to:(.+)$/i);
         const subjectMatch = part.match(/^subject:(.+)$/i);
+        const hasMatch = part.match(/^has:(.+)$/i);
+        const isMatch = part.match(/^is:(.+)$/i);
+        const dateMatch = part.match(/^date:(.+)$/i);
         if (fromMatch) {
             const term = `%${fromMatch[1].replace(/"/g, "")}%`;
             conditions.push("(from_name LIKE ? OR from_address LIKE ?)");
@@ -91,6 +143,42 @@ export function parseSearchQuery(query) {
             conditions.push("subject LIKE ?");
             params.push(term);
         }
+        else if (hasMatch) {
+            const v = hasMatch[1].toLowerCase();
+            if (v === "attachment" || v === "attachments") {
+                conditions.push("has_attachments = 1");
+            }
+            // Unknown has: qualifier — silently drop; treating as a literal
+            // search term would be confusing.
+        }
+        else if (isMatch) {
+            const v = isMatch[1].toLowerCase();
+            if (v === "flagged" || v === "starred") {
+                conditions.push("flags_json LIKE ?");
+                params.push("%\\\\Flagged%");
+            }
+            else if (v === "unread") {
+                conditions.push("flags_json NOT LIKE ?");
+                params.push("%\\\\Seen%");
+            }
+            else if (v === "read") {
+                conditions.push("flags_json LIKE ?");
+                params.push("%\\\\Seen%");
+            }
+        }
+        else if (dateMatch) {
+            const spec = parseDateSpec(dateMatch[1]);
+            if (spec) {
+                if (spec.from !== undefined) {
+                    conditions.push("date >= ?");
+                    params.push(spec.from);
+                }
+                if (spec.to !== undefined) {
+                    conditions.push("date < ?");
+                    params.push(spec.to);
+                }
+            }
+        }
         else {
             const term = `%${part}%`;
             conditions.push("(subject LIKE ? OR from_name LIKE ? OR from_address LIKE ? OR preview LIKE ?)");