@bobfrankston/iflow-direct 0.1.59 → 0.1.61

package/imap-compat.d.ts

@@ -87,7 +87,12 @@ export declare class CompatImapClient {
     fetchMessages(mailbox: string, end: number, count: number, options?: {
         source?: boolean;
     }): Promise<FetchedMessage[]>;
-    /** Search messages in a mailbox */
+    /** Search messages in a mailbox.
+     *  Criteria: from/to/cc/subject/body/text (string or string[], each key
+     *  repeats and ANDs), since/before (Date), seen/unseen/flagged/answered/
+     *  draft (boolean flags), `not` (criteria object or array — each becomes
+     *  a NOT'd key group), `or` (array of ≥2 criteria objects — compiled to
+     *  IMAP's binary prefix OR chain). */
     searchMessages(mailbox: string, criteria: any): Promise<number[]>;
     /** Search by header value — returns matching UIDs */
     searchByHeader(mailbox: string, headerName: string, headerValue: string): Promise<number[]>;
@@ -171,4 +176,5 @@ export declare class CompatImapClient {
     /** Get flags for a UID — returns string[] for compatibility with old client */
     getFlags(mailbox: string, uid: number): Promise<string[]>;
 }
+export declare function buildSearchString(criteria: any): string;
 //# sourceMappingURL=imap-compat.d.ts.map

package/imap-compat.js

@@ -204,25 +204,16 @@ export class CompatImapClient {
         await this.native.closeMailbox();
         return msgs.map(m => new FetchedMessage(m));
     }
-    /** Search messages in a mailbox */
+    /** Search messages in a mailbox.
+     *  Criteria: from/to/cc/subject/body/text (string or string[], each key
+     *  repeats and ANDs), since/before (Date), seen/unseen/flagged/answered/
+     *  draft (boolean flags), `not` (criteria object or array — each becomes
+     *  a NOT'd key group), `or` (array of ≥2 criteria objects — compiled to
+     *  IMAP's binary prefix OR chain). */
     async searchMessages(mailbox, criteria) {
         await this.ensureConnected();
         await this.native.select(mailbox);
-        // Convert object criteria to IMAP search string
-        const parts = [];
-        if (criteria.from)
-            parts.push(`FROM "${criteria.from}"`);
-        if (criteria.to)
-            parts.push(`TO "${criteria.to}"`);
-        if (criteria.subject)
-            parts.push(`SUBJECT "${criteria.subject}"`);
-        if (criteria.body)
-            parts.push(`BODY "${criteria.body}"`);
-        if (criteria.since)
-            parts.push(`SINCE ${formatDate(criteria.since)}`);
-        if (criteria.before)
-            parts.push(`BEFORE ${formatDate(criteria.before)}`);
-        const searchStr = parts.length > 0 ? parts.join(" ") : "ALL";
+        const searchStr = buildSearchString(criteria || {});
         const uids = await this.native.search(searchStr);
         await this.native.closeMailbox();
         return uids;
@@ -383,6 +374,80 @@ export class CompatImapClient {
         return msg?.flags ? [...msg.flags] : [];
     }
 }
+/** IMAP quoted-string: backslash-escape `\` and `"`. The old inline
+ *  `"${value}"` interpolation let a user-typed quote break the whole
+ *  SEARCH command. */
+function imapQuote(v) {
+    return `"${String(v).replace(/([\\"])/g, "\\$1")}"`;
+}
+/** Compile one criteria object's own keys (no not/or) to IMAP search keys. */
+function searchKeys(c) {
+    const parts = [];
+    const each = (v, fn) => {
+        for (const x of Array.isArray(v) ? v : [v])
+            if (x)
+                fn(String(x));
+    };
+    if (c.from)
+        each(c.from, v => parts.push(`FROM ${imapQuote(v)}`));
+    if (c.to)
+        each(c.to, v => parts.push(`TO ${imapQuote(v)}`));
+    if (c.cc)
+        each(c.cc, v => parts.push(`CC ${imapQuote(v)}`));
+    if (c.subject)
+        each(c.subject, v => parts.push(`SUBJECT ${imapQuote(v)}`));
+    if (c.body)
+        each(c.body, v => parts.push(`BODY ${imapQuote(v)}`));
+    if (c.text)
+        each(c.text, v => parts.push(`TEXT ${imapQuote(v)}`));
+    if (c.since)
+        parts.push(`SINCE ${formatDate(c.since)}`);
+    if (c.before)
+        parts.push(`BEFORE ${formatDate(c.before)}`);
+    if (c.seen)
+        parts.push("SEEN");
+    if (c.unseen)
+        parts.push("UNSEEN");
+    if (c.flagged)
+        parts.push("FLAGGED");
+    if (c.unflagged)
+        parts.push("UNFLAGGED");
+    if (c.answered)
+        parts.push("ANSWERED");
+    if (c.draft)
+        parts.push("DRAFT");
+    return parts;
+}
+/** One criteria group as a single search-key (parenthesize multi-key). */
+function keyGroup(c) {
+    const keys = searchKeys(c);
+    if (keys.length === 0)
+        return null;
+    return keys.length === 1 ? keys[0] : `(${keys.join(" ")})`;
+}
+export function buildSearchString(criteria) {
+    const parts = searchKeys(criteria);
+    // Exclusions: each entry compiles to `NOT <key-group>`; several entries
+    // AND together (exclude anything matching any of them).
+    const nots = criteria.not ? (Array.isArray(criteria.not) ? criteria.not : [criteria.not]) : [];
+    for (const n of nots) {
+        const g = keyGroup(n);
+        if (g)
+            parts.push(`NOT ${g}`);
+    }
+    // One OR group: IMAP OR is binary prefix, so [a,b,c] nests to
+    // `OR a OR b c`.
+    const ors = (Array.isArray(criteria.or) ? criteria.or : []).map(keyGroup).filter(Boolean);
+    if (ors.length === 1)
+        parts.push(ors[0]);
+    else if (ors.length > 1) {
+        let expr = ors[ors.length - 1];
+        for (let i = ors.length - 2; i >= 0; i--)
+            expr = `OR ${ors[i]} ${expr}`;
+        parts.push(expr);
+    }
+    return parts.length > 0 ? parts.join(" ") : "ALL";
+}
 function formatDate(d) {
     const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
     return `${d.getDate()}-${months[d.getMonth()]}-${d.getFullYear()}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/iflow-direct",
-  "version": "0.1.59",
+  "version": "0.1.61",
   "description": "Direct IMAP client — transport-agnostic, no Node.js dependencies, browser-ready",
   "main": "index.js",
   "types": "index.ts",