@bobfrankston/mailx-store 0.1.14 → 0.1.15

package/db.d.ts

@@ -436,7 +436,7 @@ export declare class MailxDB {
      *  contact can have multiple email addresses, each is its own row). */
     deleteContactByGoogleId(googleId: string): number;
     /** Full-text search across all messages. Supports qualifiers: from:, to:, subject: */
-    searchMessages(query: string, page?: number, pageSize?: number, accountId?: string, folderId?: number): PagedResult<MessageEnvelope>;
+    searchMessages(query: string, page?: number, pageSize?: number, accountId?: string, folderId?: number, includeTrashSpam?: boolean): PagedResult<MessageEnvelope>;
     /** Rebuild FTS index from existing messages */
     rebuildSearchIndex(): number;
     /** Queue a local action for later sync to IMAP */

package/db.js

@@ -488,12 +488,12 @@ export class MailxDB {
                 actual = this.db.prepare(`PRAGMA table_info(${table})`).all();
             }
             catch (e) {
-                throw new Error(`[mailx-store] schema check failed for "${table}": ${e.message}. Run 'mailx -rebuild' to rebuild the local store.`);
+                throw new Error(`[mailx-store] schema check failed for "${table}": ${e.message}. Run 'rmfmail -rebuild' to rebuild the local store.`);
             }
             const names = new Set(actual.map(r => r.name));
             const missing = cols.filter(c => !names.has(c));
             if (missing.length > 0) {
-                throw new Error(`[mailx-store] table "${table}" is missing columns [${missing.join(", ")}] — schema migration did not complete. Run 'mailx -rebuild' to rebuild the local store.`);
+                throw new Error(`[mailx-store] table "${table}" is missing columns [${missing.join(", ")}] — schema migration did not complete. Run 'rmfmail -rebuild' to rebuild the local store.`);
             }
         }
         this.runOneShotJunkContactPurge();
@@ -2051,7 +2051,7 @@ export class MailxDB {
     }
     // ── Search ──
     /** Full-text search across all messages. Supports qualifiers: from:, to:, subject: */
-    searchMessages(query, page = 1, pageSize = 50, accountId, folderId) {
+    searchMessages(query, page = 1, pageSize = 50, accountId, folderId, includeTrashSpam = false) {
         query = (query || "").trim();
         // Parse qualifiers (C45: extended set — date:, has:, is:, folder:).
         let ftsQuery = "";
@@ -2179,11 +2179,22 @@ export class MailxDB {
                 scopeWhere = " AND m.account_id = ?";
                 scopeParams.push(accountId);
             }
+            // Global / account-wide search excludes trash + junk unless the
+            // user opted in. A user typing "invoice" in the search box almost
+            // never wants the deleted/spam copy that's already filtered out
+            // of every other view. When the user IS explicitly scoped to
+            // trash/junk via folderId, this guard is skipped.
+            if (!includeTrashSpam && !folderId) {
+                scopeWhere += " AND (f.special_use IS NULL OR f.special_use NOT IN ('trash','junk'))";
+            }
             if (extraWhere.length > 0) {
                 scopeWhere += " AND " + extraWhere.join(" AND ");
                 scopeParams.push(...extraParams);
             }
-            const countRow = this.db.prepare(`SELECT COUNT(*) as cnt FROM messages m JOIN messages_fts fts ON m.id = fts.rowid WHERE messages_fts MATCH ?${scopeWhere}`).get(ftsQuery, ...scopeParams);
+            const countRow = this.db.prepare(`SELECT COUNT(*) as cnt FROM messages m
+                 JOIN messages_fts fts ON m.id = fts.rowid
+                 LEFT JOIN folders f ON f.id = m.folder_id AND f.account_id = m.account_id
+                 WHERE messages_fts MATCH ?${scopeWhere}`).get(ftsQuery, ...scopeParams);
             const total = countRow?.cnt || 0;
             const rows = this.db.prepare(`SELECT m.*, f.name AS folder_name FROM messages m
                  JOIN messages_fts fts ON m.id = fts.rowid

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",