@mohasinac/appkit 2.8.3 → 2.8.4

package/dist/features/stores/components/StoreDetailLayoutView.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { sieveFilter, sieveAnd, SIEVE_OP } from "@mohasinac/appkit";
 import { cache } from "react";
 import { storeRepository, productRepository, categoriesRepository, siteSettingsRepository, reviewRepository, couponsRepository } from "../../../repositories";
 import { ROUTES } from "../../../next";
@@ -30,19 +31,19 @@ export async function StoreDetailLayoutView({ storeSlug, activeTab, children, })
     const [productsCount, auctionsCount, preOrdersCount, prizeDrawsCount, bundlesCount, couponsCount, reviewsCount] = storeId
         ? await Promise.all([
             productRepository
-                .list({ filters: `storeId==${storeId},status==published,listingType==standard`, page: 1, pageSize: 1 })
+                .list({ filters: sieveAnd(sieveFilter("storeId", SIEVE_OP.EQ, storeId), sieveFilter("status", SIEVE_OP.EQ, "published"), sieveFilter("listingType", SIEVE_OP.EQ, "standard")), page: 1, pageSize: 1 })
                 .then((r) => r.total)
                 .catch(() => 0),
             productRepository
-                .list({ filters: `storeId==${storeId},status==published,listingType==auction`, page: 1, pageSize: 1 })
+                .list({ filters: sieveAnd(sieveFilter("storeId", SIEVE_OP.EQ, storeId), sieveFilter("status", SIEVE_OP.EQ, "published"), sieveFilter("listingType", SIEVE_OP.EQ, "auction")), page: 1, pageSize: 1 })
                 .then((r) => r.total)
                 .catch(() => 0),
             productRepository
-                .list({ filters: `storeId==${storeId},status==published,listingType==pre-order`, page: 1, pageSize: 1 })
+                .list({ filters: sieveAnd(sieveFilter("storeId", SIEVE_OP.EQ, storeId), sieveFilter("status", SIEVE_OP.EQ, "published"), sieveFilter("listingType", SIEVE_OP.EQ, "pre-order")), page: 1, pageSize: 1 })
                 .then((r) => r.total)
                 .catch(() => 0),
             productRepository
-                .list({ filters: `storeId==${storeId},status==published,listingType==prize-draw`, page: 1, pageSize: 1 })
+                .list({ filters: sieveAnd(sieveFilter("storeId", SIEVE_OP.EQ, storeId), sieveFilter("status", SIEVE_OP.EQ, "published"), sieveFilter("listingType", SIEVE_OP.EQ, "prize-draw")), page: 1, pageSize: 1 })
                 .then((r) => r.total)
                 .catch(() => 0),
             // SB-UNI-D — bundles live on categories with categoryType:"bundle"
@@ -52,11 +53,11 @@ export async function StoreDetailLayoutView({ storeSlug, activeTab, children, })
                 .then((rows) => rows.filter((c) => c.createdByStoreId === storeId).length)
                 .catch(() => 0),
             couponsRepository
-                .list({ filters: `sellerId==${storeId},validity.isActive==true`, page: 1, pageSize: 1 })
+                .list({ filters: sieveAnd(sieveFilter("sellerId", SIEVE_OP.EQ, storeId), sieveFilter("validity.isActive", SIEVE_OP.EQ, "true")), page: 1, pageSize: 1 })
                 .then((r) => r.total)
                 .catch(() => 0),
             reviewRepository
-                .listAll({ filters: `storeId==${storeId},status==approved`, page: 1, pageSize: 1 })
+                .listAll({ filters: sieveAnd(sieveFilter("storeId", SIEVE_OP.EQ, storeId), sieveFilter("status", SIEVE_OP.EQ, "approved")), page: 1, pageSize: 1 })
                 .then((r) => r.total)
                 .catch(() => 0),
         ])

package/dist/features/stores/components/StorePreOrdersPageView.js

@@ -1,4 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { sieveFilter, sieveAnd, SIEVE_OP } from "@mohasinac/appkit";
+import { sortBy } from "@mohasinac/appkit";
 import { productRepository } from "../../../repositories";
 import { getStoreBySlug } from "./StoreDetailLayoutView";
 import { StorePreOrdersListing } from "./StorePreOrdersListing";
@@ -8,8 +10,8 @@ export async function StorePreOrdersPageView({ storeSlug }) {
     const result = storeId
         ? await productRepository
             .list({
-            filters: `storeId==${storeId},status==published,listingType==pre-order`,
-            sorts: "-createdAt",
+            filters: sieveAnd(sieveFilter("storeId", SIEVE_OP.EQ, storeId), sieveFilter("status", SIEVE_OP.EQ, "published"), sieveFilter("listingType", SIEVE_OP.EQ, "pre-order")),
+            sorts: sortBy("createdAt", "DESC"),
             page: 1,
             pageSize: 24,
         })

package/dist/features/stores/components/StorePrizeDrawsPageView.js

@@ -1,4 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { sieveFilter, sieveAnd, SIEVE_OP } from "@mohasinac/appkit";
+import { sortBy } from "@mohasinac/appkit";
 import { productRepository } from "../../../repositories";
 import { getStoreBySlug } from "./StoreDetailLayoutView";
 import { PrizeDrawsIndexListing } from "../../products/components/PrizeDrawsIndexListing";
@@ -17,8 +19,8 @@ export async function StorePrizeDrawsPageView({ storeSlug, }) {
     }
     const result = await productRepository
         .list({
-        filters: `storeId==${storeId},status==published,listingType==prize-draw`,
-        sorts: "-createdAt",
+        filters: sieveAnd(sieveFilter("storeId", SIEVE_OP.EQ, storeId), sieveFilter("status", SIEVE_OP.EQ, "published"), sieveFilter("listingType", SIEVE_OP.EQ, "prize-draw")),
+        sorts: sortBy("createdAt", "DESC"),
         page: 1,
         pageSize: 24,
     })

package/dist/features/stores/components/StoreProductsPageView.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { sieveFilter, sieveAnd, SIEVE_OP } from "@mohasinac/appkit";
 import { productRepository } from "../../../repositories";
 import { parseListingSearchParams } from "../../../utils/listing-params";
 import { getStoreBySlug } from "./StoreDetailLayoutView";
@@ -18,7 +19,7 @@ export async function StoreProductsPageView({ storeSlug, searchParams, }) {
     const pageSize = std.pageSize ?? DEFAULT_PAGE_SIZE;
     const result = await productRepository
         .list({
-        filters: `storeId==${storeId},status==published,listingType==standard`,
+        filters: sieveAnd(sieveFilter("storeId", SIEVE_OP.EQ, storeId), sieveFilter("status", SIEVE_OP.EQ, "published"), sieveFilter("listingType", SIEVE_OP.EQ, "standard")),
         sorts,
         page,
         pageSize,

package/dist/features/stores/components/StoreProductsView.js

@@ -1,5 +1,6 @@
 "use client";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { sortBy } from "@mohasinac/appkit";
 import { useState } from "react";
 import { Div, Heading, Input, Select, SlottedListingView } from "../../../ui";
 export function StoreProductsView({ storeSlug, labels = {}, renderProducts, renderSearch, renderSort, renderFilters, renderActiveFilters, renderViewToggle, renderPagination, items = [], total = 0, isLoading = false, className = "", }) {
@@ -8,9 +9,9 @@ export function StoreProductsView({ storeSlug, labels = {}, renderProducts, rend
     const [viewMode, setViewMode] = useState("grid");
     void storeSlug;
     return (_jsx(Div, { className: `py-4 ${className}`, children: _jsx(SlottedListingView, { portal: "public", inlineToolbar: true, className: "space-y-4", renderHeader: () => labels.title ? (_jsx(Heading, { level: 2, className: "mb-1 text-xl font-semibold", children: labels.title })) : null, renderSearch: () => renderSearch?.(search, setSearch) ?? (_jsx(Input, { value: search, onChange: (event) => setSearch(event.target.value), placeholder: "Search store products", className: "max-w-sm" })), renderSort: () => renderSort?.(sort, setSort) ?? (_jsx(Select, { value: sort, onValueChange: setSort, options: [
-                    { value: "-createdAt", label: "Newest" },
-                    { value: "createdAt", label: "Oldest" },
-                    { value: "price", label: "Price: Low to High" },
-                    { value: "-price", label: "Price: High to Low" },
+                    { value: sortBy("createdAt", "DESC"), label: "Newest" },
+                    { value: sortBy("createdAt", "ASC"), label: "Oldest" },
+                    { value: sortBy("price", "ASC"), label: "Price: Low to High" },
+                    { value: sortBy("price", "DESC"), label: "Price: High to Low" },
                 ], className: "min-w-44" })), renderFilters: renderFilters, renderActiveFilters: renderActiveFilters, renderBulkActions: () => renderViewToggle?.(viewMode, setViewMode) ?? null, renderTable: () => renderProducts(items, isLoading), renderPagination: () => renderPagination?.(total) ?? null, total: total, isLoading: isLoading }) }));
 }

package/dist/features/stores/components/StoresIndexListing.js

@@ -1,5 +1,6 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { sieveFilter, SIEVE_OP } from "@mohasinac/appkit";
 import { useState, useCallback, useMemo } from "react";
 import { useUrlTable } from "../../../react/hooks/useUrlTable";
 import { useStores } from "../hooks/useStores";
@@ -103,12 +104,12 @@ export function StoresIndexListing({ initialData }) {
     if (ratingRaw) {
         const ratings = ratingRaw.split("|").filter(Boolean);
         if (ratings.length === 1)
-            filterParts.push(`averageRating>=${ratings[0]}`);
+            filterParts.push(sieveFilter("averageRating", SIEVE_OP.GTE, ratings[0]));
     }
     if (minProductCount)
-        filterParts.push(`stats.totalProducts>=${minProductCount}`);
+        filterParts.push(sieveFilter("stats.totalProducts", SIEVE_OP.GTE, minProductCount));
     if (maxProductCount)
-        filterParts.push(`stats.totalProducts<=${maxProductCount}`);
+        filterParts.push(sieveFilter("stats.totalProducts", SIEVE_OP.LTE, maxProductCount));
     if (featured === "true")
         filterParts.push("isFeatured==true");
     const { stores, totalPages, isLoading } = useStores({

package/dist/features/stores/hooks/useStoreAddressSelector.d.ts

@@ -16,7 +16,7 @@ export declare function useStoreAddressSelector(options?: {
 }): {
     addresses: SavedAddress[];
     isLoading: boolean;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<SavedAddress[]>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<SavedAddress[], Error>>;
     createAddress: import("@tanstack/react-query").UseMutateFunction<CreateAddressApiResponse, Error, AddressFormData, unknown>;
     isSaving: boolean;
 };

package/dist/features/stores/hooks/useStores.d.ts

@@ -12,16 +12,16 @@ export declare function useStores(params?: StoreListParams, opts?: UseStoresOpti
     hasMore: boolean;
     isLoading: false;
     error: string | null;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<StoreListResponse>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<StoreListResponse, Error>>;
 };
 export declare function useStoreBySlug(storeSlug: string, opts?: {
     enabled?: boolean;
     endpoint?: string;
 }): {
-    store: NonNullable<NoInfer<StoreDetail | null>> | null;
+    store: StoreDetail | null;
     isLoading: boolean;
     error: string | null;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<StoreDetail | null>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<StoreDetail | null, Error>>;
 };
 export declare function useStoreProducts(storeSlug: string, params?: string, opts?: {
     enabled?: boolean;
@@ -32,7 +32,7 @@ export declare function useStoreProducts(storeSlug: string, params?: string, opt
     totalPages: number;
     isLoading: boolean;
     error: string | null;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<StoreProductsResponse>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<StoreProductsResponse, Error>>;
 };
 export declare function useStoreAuctions(storeSlug: string, params?: string, opts?: {
     enabled?: boolean;
@@ -43,7 +43,7 @@ export declare function useStoreAuctions(storeSlug: string, params?: string, opt
     totalPages: number;
     isLoading: boolean;
     error: string | null;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<StoreAuctionsResponse>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<StoreAuctionsResponse, Error>>;
 };
 export declare function useStoreReviews(storeSlug: string, params?: {
     rating?: number;
@@ -66,6 +66,6 @@ export declare function useStoreReviews(storeSlug: string, params?: {
     ratingDistribution: Record<number, number>;
     isLoading: boolean;
     error: string | null;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<StoreReviewsData>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<StoreReviewsData, Error>>;
 };
 export {};

package/dist/features/wishlist/components/WishlistView.js

@@ -1,14 +1,15 @@
 "use client";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { sortBy } from "@mohasinac/appkit";
 import React from "react";
 import { Div, Heading, Row, Text } from "../../../ui";
 import { useUrlTable } from "../../../react/hooks/useUrlTable";
 import { useWishlist } from "../hooks/useWishlist";
 const WISHLIST_SORT_OPTIONS = [
-    { value: "-addedAt", label: "Newest first" },
+    { value: sortBy("addedAt", "DESC"), label: "Newest first" },
     { value: "addedAt", label: "Oldest first" },
-    { value: "-price", label: "Price: high → low" },
-    { value: "price", label: "Price: low → high" },
+    { value: sortBy("price", "DESC"), label: "Price: high → low" },
+    { value: sortBy("price", "ASC"), label: "Price: low → high" },
 ];
 export function WishlistView({ userId, initialData, labels = {}, renderTabs, renderSearch, renderSort, renderViewToggle, renderProducts, renderTabPlaceholder, renderBulkActions, renderPagination, className = "", }) {
     const table = useUrlTable({ defaults: { sort: "-addedAt", view: "card" } });

package/dist/features/wishlist/hooks/useUserWishlist.d.ts

@@ -17,7 +17,7 @@ interface UseUserWishlistOptions<TProduct> {
 }
 export declare function useUserWishlist<TProduct = unknown>(options?: UseUserWishlistOptions<TProduct>): {
     total: number;
-    data: NoInfer<UserWishlistResponse<TProduct>>;
+    data: UserWishlistResponse<TProduct>;
     error: Error;
     isError: true;
     isPending: false;
@@ -40,12 +40,12 @@ export declare function useUserWishlist<TProduct = unknown>(options?: UseUserWis
     isRefetching: boolean;
     isStale: boolean;
     isEnabled: boolean;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<UserWishlistResponse<TProduct>>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<UserWishlistResponse<TProduct>, Error>>;
     fetchStatus: import("@tanstack/query-core").FetchStatus;
-    promise: Promise<NoInfer<UserWishlistResponse<TProduct>>>;
+    promise: Promise<UserWishlistResponse<TProduct>>;
 } | {
     total: number;
-    data: NoInfer<UserWishlistResponse<TProduct>>;
+    data: UserWishlistResponse<TProduct>;
     error: null;
     isError: false;
     isPending: false;
@@ -68,9 +68,9 @@ export declare function useUserWishlist<TProduct = unknown>(options?: UseUserWis
     isRefetching: boolean;
     isStale: boolean;
     isEnabled: boolean;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<UserWishlistResponse<TProduct>>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<UserWishlistResponse<TProduct>, Error>>;
     fetchStatus: import("@tanstack/query-core").FetchStatus;
-    promise: Promise<NoInfer<UserWishlistResponse<TProduct>>>;
+    promise: Promise<UserWishlistResponse<TProduct>>;
 } | {
     total: number;
     data: undefined;
@@ -96,9 +96,9 @@ export declare function useUserWishlist<TProduct = unknown>(options?: UseUserWis
     isRefetching: boolean;
     isStale: boolean;
     isEnabled: boolean;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<UserWishlistResponse<TProduct>>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<UserWishlistResponse<TProduct>, Error>>;
     fetchStatus: import("@tanstack/query-core").FetchStatus;
-    promise: Promise<NoInfer<UserWishlistResponse<TProduct>>>;
+    promise: Promise<UserWishlistResponse<TProduct>>;
 } | {
     total: number;
     data: undefined;
@@ -124,9 +124,9 @@ export declare function useUserWishlist<TProduct = unknown>(options?: UseUserWis
     isRefetching: boolean;
     isStale: boolean;
     isEnabled: boolean;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<UserWishlistResponse<TProduct>>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<UserWishlistResponse<TProduct>, Error>>;
     fetchStatus: import("@tanstack/query-core").FetchStatus;
-    promise: Promise<NoInfer<UserWishlistResponse<TProduct>>>;
+    promise: Promise<UserWishlistResponse<TProduct>>;
 } | {
     total: number;
     data: undefined;
@@ -152,12 +152,12 @@ export declare function useUserWishlist<TProduct = unknown>(options?: UseUserWis
     isRefetching: boolean;
     isStale: boolean;
     isEnabled: boolean;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<UserWishlistResponse<TProduct>>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<UserWishlistResponse<TProduct>, Error>>;
     fetchStatus: import("@tanstack/query-core").FetchStatus;
-    promise: Promise<NoInfer<UserWishlistResponse<TProduct>>>;
+    promise: Promise<UserWishlistResponse<TProduct>>;
 } | {
     total: number;
-    data: NoInfer<UserWishlistResponse<TProduct>>;
+    data: UserWishlistResponse<TProduct>;
     isError: false;
     error: null;
     isPending: false;
@@ -180,8 +180,8 @@ export declare function useUserWishlist<TProduct = unknown>(options?: UseUserWis
     isRefetching: boolean;
     isStale: boolean;
     isEnabled: boolean;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<UserWishlistResponse<TProduct>>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<UserWishlistResponse<TProduct>, Error>>;
     fetchStatus: import("@tanstack/query-core").FetchStatus;
-    promise: Promise<NoInfer<UserWishlistResponse<TProduct>>>;
+    promise: Promise<UserWishlistResponse<TProduct>>;
 };
 export {};

package/dist/features/wishlist/hooks/useWishlist.d.ts

@@ -11,6 +11,6 @@ export declare function useWishlist(userId: string, opts?: UseWishlistOptions):
     isWishlisted: (productId: string) => boolean;
     isLoading: boolean;
     error: Error | null;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<WishlistResponse>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<WishlistResponse, Error>>;
 };
 export {};

package/dist/features/wishlist/hooks/useWishlistWithGuest.d.ts

@@ -17,7 +17,7 @@ export declare function useWishlistWithGuest(userId: string | null | undefined,
     isWishlisted: (productId: string) => boolean;
     isLoading: boolean;
     error: Error | null;
-    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<WishlistResponse>, Error>>;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<WishlistResponse, Error>>;
     isGuest: boolean;
     guestWishlist?: undefined;
 } | {

package/package.json

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