applesauce-sqlite 4.1.0 → 4.4.0

package/dist/helpers/search.d.ts

@@ -1,10 +1,10 @@
-import { Filter, NostrEvent } from "applesauce-core/helpers";
+import { FilterWithAnd, NostrEvent } from "applesauce-core/helpers";
 import type { Statement } from "./statements.js";
 export declare const CREATE_SEARCH_TABLE_STATEMENT: Statement<[]>;
 export declare const INSERT_SEARCH_CONTENT_STATEMENT: Statement<[string, string, number, string, number]>;
 export declare const DELETE_SEARCH_CONTENT_STATEMENT: Statement<[string]>;
-/** Filter with search field */
-export type FilterWithSearch = Filter & {
+/** Filter with search field and NIP-ND AND operator support */
+export type FilterWithSearch = FilterWithAnd & {
     search?: string;
     order?: "created_at" | "rank";
 };

package/dist/helpers/sql.js

@@ -49,19 +49,49 @@ export function buildFilterConditions(filter) {
         conditions.push(`events.created_at <= ?`);
         params.push(filter.until);
     }
-    // Handle tag filters (e.g., #e, #p, #t, #d, etc.)
+    // Handle AND tag filters (& prefix) first - NIP-ND
+    // AND takes precedence and requires ALL values to be present
+    for (const [key, values] of Object.entries(filter)) {
+        if (key.startsWith("&") && values && Array.isArray(values) && values.length > 0) {
+            const tagName = key.slice(1); // Remove the '&' prefix
+            // Use a single subquery with GROUP BY + HAVING COUNT for efficiency
+            // This is more efficient than multiple JOINs for the same tag
+            const placeholders = values.map(() => "?").join(", ");
+            conditions.push(`events.id IN (
+        SELECT event_id
+        FROM event_tags
+        WHERE tag_name = ? AND tag_value IN (${placeholders})
+        GROUP BY event_id
+        HAVING COUNT(DISTINCT tag_value) = ?
+      )`);
+            // Add parameters: tagName, all tag values, then count of values
+            params.push(tagName, ...values, values.length);
+        }
+    }
+    // Handle OR tag filters (# prefix)
+    // Skip values that are in AND tags (NIP-ND rule)
     for (const [key, values] of Object.entries(filter)) {
         if (key.startsWith("#") && values && Array.isArray(values) && values.length > 0) {
             const tagName = key.slice(1); // Remove the '#' prefix
+            // Check if there's a corresponding AND filter for this tag
+            const andKey = `&${tagName}`;
+            const andValues = filter[andKey];
+            // Filter out values that are in AND tags (NIP-ND rule)
+            const filteredValues = andValues
+                ? values.filter((v) => !andValues.includes(v))
+                : values;
+            // Only apply OR filter if there are values left after filtering
+            if (filteredValues.length === 0)
+                continue;
             // Use the event_tags table for efficient tag filtering
-            const placeholders = values.map(() => "?").join(", ");
+            const placeholders = filteredValues.map(() => "?").join(", ");
             conditions.push(`events.id IN (
         SELECT DISTINCT event_id
         FROM event_tags
         WHERE tag_name = ? AND tag_value IN (${placeholders})
       )`);
-            // Add parameters: tagName first, then all the tag values
-            params.push(tagName, ...values);
+            // Add parameters: tagName first, then all the filtered tag values
+            params.push(tagName, ...filteredValues);
         }
     }
     return { conditions, params, search };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-sqlite",
-  "version": "4.1.0",
+  "version": "4.4.0",
   "description": "sqlite event databases for applesauce",
   "type": "module",
   "main": "dist/index.js",
@@ -102,7 +102,7 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "^4.1.0"
+    "applesauce-core": "^4.4.0"
   },
   "optionalDependencies": {
     "@libsql/client": "^0.15.15",