imapflow 1.7.3 → 1.7.4

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "1.7.3"
+    ".": "1.7.4"
 }

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.7.4](https://github.com/postalsys/imapflow/compare/v1.7.3...v1.7.4) (2026-08-24)
+
+
+### Bug Fixes
+
+* **search:** normalize search dates so invalid values cannot throw or emit NaN ([bf6c6bb](https://github.com/postalsys/imapflow/commit/bf6c6bb9c9e649ac9c28eba2c42f744b7d7d8e63)), closes [#385](https://github.com/postalsys/imapflow/issues/385)
+
 ## [1.7.3](https://github.com/postalsys/imapflow/compare/v1.7.2...v1.7.3) (2026-08-24)
 
 

package/lib/search-compiler.js

@@ -2,7 +2,7 @@
 
 'use strict';
 
-const { formatDate, formatFlag, canUseFlag, isDate, isRev2Active } = require('./tools.js');
+const { formatDate, formatFlag, canUseFlag, toValidDate, isRev2Active } = require('./tools.js');
 
 /**
  * Sets a boolean flag in the IMAP search attributes.
@@ -71,15 +71,25 @@ let setOpt = (attributes, term, value) => {
  *
  * @param {Array} attributes - Array to append the attribute to
  * @param {string} term - The date search term (e.g., 'BEFORE', 'SINCE')
- * @param {*} value - Date value to format
+ * @param {Date|String} value - Date value to format
  */
 let processDateField = (attributes, term, value) => {
-    if (['BEFORE', 'SENTBEFORE'].includes(term.toUpperCase()) && isDate(value) && value.toISOString().substring(11) !== '00:00:00.000Z') {
+    // Normalize first. A Date brand check is not enough on its own: an invalid
+    // Date is still a Date and toISOString() throws on it. Normalizing here also
+    // means a date string behaves exactly like the equivalent Date object.
+    value = toValidDate(value);
+    if (!value) {
+        return;
+    }
+
+    if (['BEFORE', 'SENTBEFORE'].includes(term.toUpperCase()) && value.toISOString().substring(11) !== '00:00:00.000Z') {
         // Set to next day to include current day as well, othwerise BEFORE+AFTER
         // searches for the same day but different time values do not match anything
         value = new Date(value.getTime() + 24 * 3600 * 1000);
     }
 
+    // Still reachable after the guard above: the +24h shift can push a near-max
+    // Date past the representable range
     let date = formatDate(value);
     if (!date) {
         return;
@@ -338,18 +348,25 @@ module.exports.searchCompiler = (connection, query) => {
                 case 'BEFORE':
                 case 'SINCE':
                     {
+                        // Normalize above the capability check so the WITHIN shortcut
+                        // and the standard path agree on what counts as a usable date
+                        let value = toValidDate(params[term]);
+                        if (!value) {
+                            break;
+                        }
+
                         // Use WITHIN extension for better timezone handling if available
-                        if (connection.capabilities.has('WITHIN') && isDate(params[term])) {
+                        if (connection.capabilities.has('WITHIN')) {
                             // Convert to seconds ago from now
                             const now = Date.now();
-                            const withinSeconds = Math.round(Math.max(0, now - params[term].getTime()) / 1000);
+                            const withinSeconds = Math.round(Math.max(0, now - value.getTime()) / 1000);
                             const withinKeyword = term.toUpperCase() === 'BEFORE' ? 'OLDER' : 'YOUNGER';
                             setOpt(attributes, withinKeyword, withinSeconds.toString());
                             break;
                         }
 
                         // Fallback to standard date search
-                        processDateField(attributes, term, params[term]);
+                        processDateField(attributes, term, value);
                     }
                     break;
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapflow",
-    "version": "1.7.3",
+    "version": "1.7.4",
     "description": "IMAP Client for Node",
     "main": "lib/imap-flow.js",
     "types": "lib/imap-flow.d.ts",

package/test/search-compiler-test.js

@@ -710,6 +710,57 @@ module.exports['Search Compiler: Date with invalid value ignored'] = test => {
     test.done();
 };
 
+module.exports['Search Compiler: all date keys ignore an invalid Date object'] = test => {
+    // An invalid Date is still a Date, so a plain Date brand check let it through:
+    // BEFORE/SENTBEFORE threw RangeError from toISOString(), and with WITHIN
+    // advertised BEFORE/SINCE compiled a literal "OLDER NaN"/"YOUNGER NaN" token
+    for (let capabilities of [[['IMAP4rev1', true]], [['WITHIN', true]]]) {
+        for (let key of ['before', 'since', 'on', 'sentBefore', 'sentOn', 'sentSince']) {
+            let connection = createMockConnection({ capabilities });
+            let compiled = searchCompiler(connection, { [key]: new Date('not-a-date') });
+
+            test.deepEqual(compiled, [], `${key} should compile to no attributes`);
+        }
+    }
+
+    test.done();
+};
+
+module.exports['Search Compiler: invalid date drops only its own criterion'] = test => {
+    let connection = createMockConnection();
+    let compiled = searchCompiler(connection, { seen: true, before: new Date('not-a-date') });
+
+    test.deepEqual(compiled, [{ type: 'ATOM', value: 'SEEN' }]);
+    test.done();
+};
+
+module.exports['Search Compiler: date string and Date object compile alike for BEFORE'] = test => {
+    let asDate = searchCompiler(createMockConnection(), { before: new Date('2023-06-15T12:30:00.000Z') });
+    let asString = searchCompiler(createMockConnection(), { before: '2023-06-15T12:30:00.000Z' });
+
+    // Both input forms are documented, so both must get the +24h shift that makes
+    // same-day BEFORE+SINCE ranges match. The string form used to skip it.
+    test.deepEqual(asString, asDate);
+    test.ok(hasAttr(asString, '16-Jun-2023'));
+    test.done();
+};
+
+module.exports['Search Compiler: date string and Date object compile alike for WITHIN'] = test => {
+    let connection = createMockConnection({ capabilities: [['WITHIN', true]] });
+    let recentDate = new Date(Date.now() - 3600 * 1000); // 1 hour ago
+    let asDate = searchCompiler(connection, { since: recentDate });
+    let asString = searchCompiler(connection, { since: recentDate.toISOString() });
+
+    // The string form used to skip the WITHIN shortcut and compile SINCE instead
+    test.ok(hasAttr(asDate, 'YOUNGER'));
+    test.ok(hasAttr(asString, 'YOUNGER'));
+    // The keyword atom is followed by its value token
+    let seconds = attrs => Number(attrs[1].value);
+    // Both are measured against Date.now() at compile time, so allow a small drift
+    test.ok(Math.abs(seconds(asString) - seconds(asDate)) <= 1);
+    test.done();
+};
+
 // ============================================
 // KEYWORD tests
 // ============================================