@mohasinac/appkit 4.13.1 → 4.15.0

package/dist/providers/db-firebase/sieve.js

@@ -128,12 +128,15 @@ function withAliasesExpanded(model, aliases) {
     return { ...model, filters: expanded };
 }
 /**
- * Apply Sieve DSL to a CollectionReference/Query without requiring repository subclassing.
+ * Build the filtered (unpaginated) Firestore query for a Sieve model.
+ *
+ * Extracted so the count-only path and the full list path apply the SAME
+ * filter pipeline — alias expansion included. Hand-building a Firestore query
+ * for a "just give me the total" call would skip `expandFilterAliases`, and a
+ * same-field OR group like `listingType==art|stickers` would silently vanish
+ * (Root Cause #58). Never reimplement this; call it.
  */
-export async function applySieveToFirestore(params) {
-    const { baseQuery, model, fields, options } = params;
-    const { aliases, ...rest } = options ?? {};
-    const merged = { ...SIEVE_DEFAULTS, ...rest };
+function buildFilteredSieveQuery(baseQuery, model, fields, merged, aliases) {
     const effective = withAliasesExpanded(model, aliases);
     const processor = new SieveProcessorBase({
         // MUST be the enhanced adapter, not the stock one. This is the path
@@ -150,12 +153,37 @@ export async function applySieveToFirestore(params) {
         options: merged,
         fields,
     });
+    return processor.apply(effective, baseQuery, {
+        applyPagination: false,
+    });
+}
+/**
+ * Count matching documents WITHOUT reading any of them.
+ *
+ * `applySieveToFirestore(...).total` already counts via the `.count()`
+ * aggregation, but it also fetches a page of documents on the way — so the
+ * `list({ pageSize: 1 }).total` idiom used across the codebase pays for one
+ * wasted document read per call. Facet/tab counts issue one query per union
+ * member, so that waste multiplies; this path skips the document read
+ * entirely.
+ */
+export async function countSieveMatches(params) {
+    const { baseQuery, model, fields, options } = params;
+    const { aliases, ...rest } = options ?? {};
+    const merged = { ...SIEVE_DEFAULTS, ...rest };
+    return getFirestoreCount(buildFilteredSieveQuery(baseQuery, model, fields, merged, aliases));
+}
+/**
+ * Apply Sieve DSL to a CollectionReference/Query without requiring repository subclassing.
+ */
+export async function applySieveToFirestore(params) {
+    const { baseQuery, model, fields, options } = params;
+    const { aliases, ...rest } = options ?? {};
+    const merged = { ...SIEVE_DEFAULTS, ...rest };
     const page = Math.max(1, Number(model.page ?? 1));
     const pageSize = Math.min(merged.maxPageSize, Math.max(1, Number(model.pageSize ?? merged.defaultPageSize)));
     // Apply filters + sorts once; count without reading docs.
-    const filteredQ = processor.apply(effective, baseQuery, {
-        applyPagination: false,
-    });
+    const filteredQ = buildFilteredSieveQuery(baseQuery, model, fields, merged, aliases);
     const total = await getFirestoreCount(filteredQ);
     // Apply pagination on top of the already-filtered query — avoids re-applying
     // the full Sieve DSL from the base.
@@ -185,19 +213,10 @@ export class FirebaseSieveRepository extends FirebaseRepository {
         const { baseQuery, aliases, ...sieveOptions } = options ?? {};
         const merged = { ...SIEVE_DEFAULTS, ...sieveOptions };
         const base = baseQuery ?? this.getCollection();
-        const effective = withAliasesExpanded(model, aliases);
-        const processor = new SieveProcessorBase({
-            adapter: createEnhancedFirebaseAdapter(),
-            autoLoadConfig: false,
-            options: merged,
-            fields,
-        });
         const page = Math.max(1, Number(model.page ?? 1));
         const pageSize = Math.min(merged.maxPageSize, Math.max(1, Number(model.pageSize ?? merged.defaultPageSize)));
         // Apply filters + sorts once; count without reading docs.
-        const filteredQ = processor.apply(effective, base, {
-            applyPagination: false,
-        });
+        const filteredQ = buildFilteredSieveQuery(base, model, fields, merged, aliases);
         const total = await getFirestoreCount(filteredQ);
         // Apply pagination on top of the already-filtered query — avoids re-applying
         // the full Sieve DSL from the base.
@@ -214,4 +233,19 @@ export class FirebaseSieveRepository extends FirebaseRepository {
             hasMore: page < totalPages,
         };
     }
+    /**
+     * Count matches for a Sieve model without reading any documents.
+     *
+     * Same filter pipeline as `sieveQuery` (aliases included) — see
+     * `countSieveMatches`.
+     */
+    async sieveCount(model, fields, options) {
+        const { baseQuery, ...rest } = options ?? {};
+        return countSieveMatches({
+            baseQuery: baseQuery ?? this.getCollection(),
+            model,
+            fields,
+            options: rest,
+        });
+    }
 }

package/dist/react/hooks/useUrlTable.js

@@ -35,7 +35,16 @@
 import { useRouter, usePathname, useSearchParams } from "next/navigation";
 import { useCallback, useRef } from "react";
 import { TABLE_KEYS } from "../../constants/table-keys";
-const NON_RESETTING_KEYS = [TABLE_KEYS.PAGE, TABLE_KEYS.PAGE_SIZE, TABLE_KEYS.VIEW];
+// Keys whose change must NOT reset pagination. `SECTION` is here because
+// expanding a form section is not a filter change: without it, opening a
+// section inside a listing's drawer would rewrite the listing's own URL with
+// `page=1` and refetch the table behind it.
+const NON_RESETTING_KEYS = [
+    TABLE_KEYS.PAGE,
+    TABLE_KEYS.PAGE_SIZE,
+    TABLE_KEYS.VIEW,
+    TABLE_KEYS.SECTION,
+];
 export function useUrlTable(options) {
     // Always call native hooks unconditionally (React rules).
     const nativeRouter = useRouter();

package/dist/schemas/firestore-value.d.ts

@@ -0,0 +1,8 @@
+import { z } from "zod";
+import type { FirestoreValue } from "./types";
+/**
+ * Recursive, so `z.lazy` — the array and record arms reference the schema
+ * being defined. The explicit `z.ZodType<FirestoreValue>` annotation is
+ * required: TypeScript cannot infer the type of a self-referential const.
+ */
+export declare const firestoreValueSchema: z.ZodType<FirestoreValue>;

package/dist/schemas/firestore-value.js

@@ -0,0 +1,44 @@
+/*
+ * WHY: A recursive "any value Firestore can store" schema, for the handful of
+ *      document fields that are legitimately open-ended — a listing template's
+ *      `defaults`, an analytics card's `filters`, a homepage section's
+ *      `config`. Those fields cannot be closed: each carries a different shape
+ *      per type, and a closed schema would SILENTLY STRIP whatever the builder
+ *      produced for a type it did not enumerate, which is the
+ *      `productBaseSchema` failure.
+ *
+ *      Open to JSON is not the same as open to anything. `z.unknown()` on such
+ *      a field passes a function or a class instance straight to the Firestore
+ *      driver, which then throws at write time rather than at parse time.
+ *
+ * WHAT: One definition, shared.
+ *
+ *       It was written twice independently before this — in
+ *       `listing-template-form.ts` and about to be a third time in
+ *       `analytics-forms.ts`. Rule of Three, so it moved here rather than
+ *       being copied again.
+ *
+ * EXPORTS: firestoreValueSchema
+ *
+ * @tag domain:schemas
+ * @tag layer:schema
+ * @tag pattern:none
+ * @tag access:isomorphic
+ * @tag consumers:listing-template-form,analytics-forms
+ * @tag sideEffects:none
+ */
+import { z } from "zod";
+/**
+ * Recursive, so `z.lazy` — the array and record arms reference the schema
+ * being defined. The explicit `z.ZodType<FirestoreValue>` annotation is
+ * required: TypeScript cannot infer the type of a self-referential const.
+ */
+export const firestoreValueSchema = z.lazy(() => z.union([
+    z.string(),
+    z.number(),
+    z.boolean(),
+    z.null(),
+    z.date(),
+    z.array(firestoreValueSchema),
+    z.record(firestoreValueSchema),
+]));

package/dist/schemas/index.d.ts

@@ -1,3 +1,3 @@
-export { SCHEMAS, lookupApiSchema, lookupFirestoreSchema, } from "./registry";
+export { SCHEMAS, lookupApiSchema, lookupFormSchema, lookupFirestoreSchema, } from "./registry";
 export type { SchemasShape, RegisteredApiRouteKey, RegisteredFirestoreCollection, RegisteredFormId, RegisteredSieveCollection, RegisteredWebhookProvider, RegisteredRtdbChannel, RegisteredStorageOp, } from "./registry";
 export type { ApiRouteKey, ApiRouteSchema, FirestoreDocument, FirestoreValue, FormFieldValue, FormValues, HttpVerb, JsonArray, JsonObject, JsonObjectWithUndefined, JsonPrimitive, JsonValue, JsonValueWithUndefined, RegistryEntry, SchemaRegistry, WebhookSchemaBucket, } from "./types";

package/dist/schemas/index.js

@@ -3,4 +3,4 @@
 // Public entry for the `SCHEMAS` registry, registry types, and lookup helpers.
 // Per-feature schemas remain in `features/<f>/schemas/index.ts`; the registry
 // composes them in `./registry.ts`.
-export { SCHEMAS, lookupApiSchema, lookupFirestoreSchema, } from "./registry";
+export { SCHEMAS, lookupApiSchema, lookupFormSchema, lookupFirestoreSchema, } from "./registry";