@mohasinac/appkit 4.30.1 → 4.30.2

package/dist/_internal/server/features/products/list-public.d.ts

@@ -116,6 +116,17 @@ export interface PublicProductQuery {
     page: number;
     pageSize: number;
     cursor?: string | null;
+    /**
+     * Free-text search, carried OUTSIDE `filters` on purpose.
+     *
+     * `searchTxt` matching is `array-contains`, which Sieve cannot express — so
+     * it travels as an opt to `productRepository.list` (and as `baseOpts.search`
+     * to the listingProcessor Function, whose products lister forwards opts
+     * wholesale). Every executor must pass it on; dropping it is silent, because
+     * a query with no search term is still a perfectly valid query that returns
+     * rows.
+     */
+    search?: string;
 }
 export interface ExecutorResult {
     items: unknown[];

package/dist/_internal/server/features/products/list-public.js

@@ -275,8 +275,18 @@ function buildFirestoreSafeFilters(input) {
     if (input.prizeRevealStatus) {
         parts.push(sieveFilter(PRODUCT_FIELDS.PRIZE_REVEAL_STATUS, SIEVE_OP.EQ, input.prizeRevealStatus));
     }
-    if (input.q)
-        parts.push(sieveFilter(PRODUCT_FIELDS.TITLE, SIEVE_OP.CONTAINS_CI, input.q));
+    // `input.q` is deliberately NOT a filter clause.
+    //
+    // It used to be `title@=*<q>` pushed HERE — before the features, tags,
+    // sublisting and typeFacets clauses below. The Firebase adapter throws on
+    // case-insensitive operators and `throwExceptions: false` swallowed it, so
+    // the processor returned the query as of the throw: with this clause first,
+    // NOTHING was applied. Typing a search term discarded every facet the user
+    // had selected AND the sort, and answered 200 with the whole catalogue.
+    //
+    // Search now travels as `query.search` (see PublicProductQuery) and becomes an
+    // `array-contains` on `searchTxt` inside the repository, which is the only
+    // shape Firestore can serve for token matching.
     // `array-contains-any` isn't supported by the Sieve Firebase adapter, so only a
     // single feature can be pushed down; multi-select falls through to the caller.
     if (input.features?.length === 1) {
@@ -329,7 +339,11 @@ async function defaultExecutor(query) {
         sorts: query.sorts,
         page: query.page,
         pageSize: query.pageSize,
-    });
+    }, 
+    // Without this second argument the repository's searchTxt read path is
+    // unreachable on the default executor, which is what every SSR listing view
+    // uses. It was implemented and simply never called.
+    query.search ? { search: query.search } : undefined);
     return {
         items: result.items,
         total: result.total,
@@ -405,6 +419,7 @@ export async function listPublicProducts(input, opts) {
             page,
             pageSize,
             cursor: input.cursor ?? null,
+            search: input.q,
         });
         if (!result)
             return null;
@@ -440,6 +455,7 @@ export async function listPublicProducts(input, opts) {
                 page: 1,
                 pageSize: PUBLIC_PRODUCT_MAX_PAGE_SIZE,
                 cursor: null,
+                search: input.q,
             });
         }));
         // One failed branch must not blank the whole scope — but it is already
@@ -505,6 +521,7 @@ export async function listPublicProducts(input, opts) {
         page: inMemory ? 1 : page,
         pageSize: inMemory ? PUBLIC_PRODUCT_MAX_PAGE_SIZE : pageSize,
         cursor: inMemory ? null : (input.cursor ?? null),
+        search: input.q,
     });
     if (!result)
         return null;

package/dist/features/products/repository/products.repository.js

@@ -5,7 +5,7 @@ import { BaseRepository, prepareForFirestore, parseSieveDateValue, } from "../..
 import { cacheManager } from "../../../core";
 import { serverLogger } from "../../../monitoring";
 import { generateUniqueId, slugify, generateBarcodeId } from "../../../utils";
-import { buildSearchTxt, parseSearchTxtQuery } from "../../../utils/search-txt";
+import { buildSearchTxt, matchesAllSearchTerms, parseSearchTxtQuery, } from "../../../utils/search-txt";
 import { PRODUCT_COLLECTION, ProductStatusValues } from "../schemas";
 import { PRODUCT_FIELDS } from "../../../constants/field-names";
 /**
@@ -408,12 +408,36 @@ export class ProductRepository extends BaseRepository {
         return baseQuery;
     }
     async list(model, opts) {
-        return this.sieveQuery(model, ProductRepository.SIEVE_FIELDS, {
+        const result = await this.sieveQuery(model, ProductRepository.SIEVE_FIELDS, {
             baseQuery: this.buildScopedQuery(opts),
             defaultPageSize: 20,
             maxPageSize: 100,
             aliases: ProductRepository.FILTER_ALIASES,
         });
+        // Only the most selective term became the `array-contains` clause, because
+        // Firestore permits one array operator per query. The REST of the terms
+        // were described as "AND-refined" in buildScopedQuery for a long time while
+        // nothing actually refined them — so "red dranzer" returned everything
+        // matching "dranzer" and the second word did nothing at all.
+        //
+        // Same shape as faqsRepository.list, deliberately: one implementation of
+        // "AND the remaining terms" that both collections read the same way.
+        const terms = parseSearchTxtQuery(opts?.search ?? "");
+        const extraTerms = terms.slice(1);
+        if (extraTerms.length === 0)
+            return result;
+        const items = result.items.filter((p) => matchesAllSearchTerms(p.searchTxt, extraTerms));
+        // `total` becomes a FLOOR once rows are dropped after the page was cut —
+        // it counts this page only. That is the known post-pagination-filter debt
+        // (Phase 5), not a new invention: reporting the pre-filter total here would
+        // promise pages that render empty.
+        return {
+            ...result,
+            items,
+            total: items.length,
+            totalPages: items.length === 0 ? 0 : 1,
+            hasMore: false,
+        };
     }
     /**
      * How many products of each listing type exist within a scope — the numbers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mohasinac/appkit",
-  "version": "4.30.1",
+  "version": "4.30.2",
   "license": "MIT",
   "publishConfig": {
     "access": "public"