@doswiftly/cli 0.1.17 → 0.1.19

package/templates/storefront-nextjs-shadcn/components/product/savings-display.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import { TrendingDown, DollarSign, Percent } from "lucide-react";
-import { useCurrencyStore } from "@/stores/currency-store";
-import { formatAmount } from "@/lib/format";
+import { useCurrencyStore } from "@doswiftly/storefront-sdk/react";
+import { formatAmount } from "@doswiftly/storefront-sdk";
 
 export interface SavingsDisplayProps {
   originalPrice: number;
@@ -27,10 +27,15 @@ export function SavingsDisplay({
   className = "",
 }: SavingsDisplayProps) {
   const preferredCurrency = useCurrencyStore((state) => state.currency);
+  const isLoaded = useCurrencyStore((state) => state.isLoaded);
   const finalCurrency = currency || preferredCurrency || "PLN";
 
   if (salePrice >= originalPrice) return null;
 
+  if (!isLoaded && !currency) {
+    return <span className={`inline-block h-4 w-20 animate-pulse rounded bg-muted ${className}`} />;
+  }
+
   const savingsAmount = originalPrice - salePrice;
   const savingsPercentage = Math.round(
     (savingsAmount / originalPrice) * 100
@@ -127,6 +132,7 @@ export function TotalSavings({
   className = "",
 }: TotalSavingsProps) {
   const preferredCurrency = useCurrencyStore((state) => state.currency);
+  const isLoaded = useCurrencyStore((state) => state.isLoaded);
   const finalCurrency = currency || preferredCurrency || "PLN";
 
   const totalSavings = items.reduce((sum, item) => {
@@ -136,6 +142,10 @@ export function TotalSavings({
 
   if (totalSavings <= 0) return null;
 
+  if (!isLoaded && !currency) {
+    return <span className={`inline-block h-5 w-24 animate-pulse rounded bg-muted ${className}`} />;
+  }
+
   return (
     <div
       className={`flex items-center justify-between rounded-lg bg-green-50 dark:bg-green-900/20 px-4 py-3 ${className}`}
@@ -169,10 +179,15 @@ export function SavingsBreakdown({
   className = "",
 }: SavingsBreakdownProps) {
   const preferredCurrency = useCurrencyStore((state) => state.currency);
+  const isLoaded = useCurrencyStore((state) => state.isLoaded);
   const finalCurrency = currency || preferredCurrency || "PLN";
 
   if (salePrice >= originalPrice) return null;
 
+  if (!isLoaded && !currency) {
+    return <span className={`inline-block h-24 w-full animate-pulse rounded bg-muted ${className}`} />;
+  }
+
   const savingsAmount = originalPrice - salePrice;
   const savingsPercentage = Math.round(
     (savingsAmount / originalPrice) * 100

package/templates/storefront-nextjs-shadcn/components/product/similar-products.tsx

@@ -1,10 +1,11 @@
 "use client";
 
-import { ProductCard, type ProductCardProduct } from "./product-card";
+import { ProductCard } from "./product-card";
 import { cn } from "@/lib/utils";
+import type { ProductCardFields } from "@/lib/graphql/fragments";
 
 export interface SimilarProductsProps {
-  products: ProductCardProduct[];
+  products: ProductCardFields[];
   title?: string;
   className?: string;
   columns?: 2 | 3 | 4;

package/templates/storefront-nextjs-shadcn/components/providers/index.ts

@@ -4,5 +4,5 @@
  * @module storefront-nextjs/components/providers
  */
 
-export { CurrencyProvider } from './currency-provider';
 export { QueryProvider } from './query-provider';
+export { StoresProvider } from './stores-provider';

package/templates/storefront-nextjs-shadcn/components/providers/stores-provider.tsx

@@ -0,0 +1,30 @@
+'use client';
+
+import { useRef, type ReactNode } from 'react';
+import { CartProvider, createCartStore } from '@/stores/cart-store';
+import { CheckoutProvider, createCheckoutStore } from '@/stores/checkout-store';
+import { WishlistProvider, createWishlistStore } from '@/stores/wishlist-store';
+
+/**
+ * Provides Context-based Zustand stores to the component tree.
+ *
+ * Creates store instances once via useRef (stable across re-renders)
+ * and wraps children in Provider components.
+ *
+ * Must be placed inside StorefrontProvider (SDK stores) and QueryProvider.
+ */
+export function StoresProvider({ children }: { children: ReactNode }) {
+  const cartStore = useRef(createCartStore()).current;
+  const checkoutStore = useRef(createCheckoutStore()).current;
+  const wishlistStore = useRef(createWishlistStore()).current;
+
+  return (
+    <CartProvider store={cartStore}>
+      <CheckoutProvider store={checkoutStore}>
+        <WishlistProvider store={wishlistStore}>
+          {children}
+        </WishlistProvider>
+      </CheckoutProvider>
+    </CartProvider>
+  );
+}

package/templates/storefront-nextjs-shadcn/components/providers/theme-provider.tsx

@@ -2,7 +2,7 @@
 
 import * as React from "react";
 import { ThemeProvider as NextThemesProvider } from "next-themes";
-import { type ThemeProviderProps } from "next-themes/dist/types";
+import { type ThemeProviderProps } from "next-themes";
 
 /**
  * ThemeProvider - Provides theme context (light/dark/system)

package/templates/storefront-nextjs-shadcn/components/returns/index.ts

@@ -9,9 +9,9 @@
 
 export {
   ReturnRequestForm,
-  ReturnRequestFormSkeleton,
   type ReturnRequestFormProps,
-  type EligibleOrderItem,
+  type ReturnableItem,
+  type ReturnFormData,
 } from "./return-request-form";
 
 export {

package/templates/storefront-nextjs-shadcn/components/returns/return-request-form.tsx

@@ -248,8 +248,9 @@ export function ReturnRequestForm({
       });
 
       setSubmitSuccess(true);
-    } catch (error: any) {
-      setSubmitError(error.message || "Failed to create return request");
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : "Failed to create return request";
+      setSubmitError(message);
     } finally {
       setIsSubmitting(false);
     }

package/templates/storefront-nextjs-shadcn/components/search/search-results.tsx

@@ -1,11 +1,12 @@
 "use client";
 
-import { ProductGrid, type ProductCardProduct } from "@/components/product/product-grid";
+import { ProductGrid } from "@/components/product/product-grid";
 import { EmptyProducts } from "@/components/ui/empty-state";
+import type { ProductCardFields } from "@/lib/graphql/fragments";
 
 export interface SearchResultsProps {
   query: string;
-  results: ProductCardProduct[];
+  results: ProductCardFields[];
 }
 
 /**

package/templates/storefront-nextjs-shadcn/components/ui/form.tsx

@@ -0,0 +1,174 @@
+"use client"
+
+import * as React from "react"
+import type {
+  ControllerProps,
+  FieldPath,
+  FieldValues,
+} from "react-hook-form"
+import { Controller, FormProvider, useFormContext } from "react-hook-form"
+
+import { cn } from "@/lib/utils"
+import { Label } from "@/components/ui/label"
+
+const Form = FormProvider
+
+type FormFieldContextValue<
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+> = {
+  name: TName
+}
+
+const FormFieldContext = React.createContext<FormFieldContextValue>(
+  {} as FormFieldContextValue
+)
+
+const FormField = <
+  TFieldValues extends FieldValues = FieldValues,
+  TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+>({
+  ...props
+}: ControllerProps<TFieldValues, TName>) => {
+  return (
+    <FormFieldContext.Provider value={{ name: props.name }}>
+      <Controller {...props} />
+    </FormFieldContext.Provider>
+  )
+}
+
+const useFormField = () => {
+  const fieldContext = React.useContext(FormFieldContext)
+  const itemContext = React.useContext(FormItemContext)
+  const { getFieldState, formState } = useFormContext()
+
+  const fieldState = getFieldState(fieldContext.name, formState)
+
+  if (!fieldContext) {
+    throw new Error("useFormField should be used within <FormField>")
+  }
+
+  const { id } = itemContext
+
+  return {
+    id,
+    name: fieldContext.name,
+    formItemId: `${id}-form-item`,
+    formDescriptionId: `${id}-form-item-description`,
+    formMessageId: `${id}-form-item-message`,
+    ...fieldState,
+  }
+}
+
+type FormItemContextValue = {
+  id: string
+}
+
+const FormItemContext = React.createContext<FormItemContextValue>(
+  {} as FormItemContextValue
+)
+
+const FormItem = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => {
+  const id = React.useId()
+
+  return (
+    <FormItemContext.Provider value={{ id }}>
+      <div ref={ref} className={cn("space-y-2", className)} {...props} />
+    </FormItemContext.Provider>
+  )
+})
+FormItem.displayName = "FormItem"
+
+const FormLabel = React.forwardRef<
+  React.ElementRef<typeof Label>,
+  React.ComponentPropsWithoutRef<typeof Label>
+>(({ className, ...props }, ref) => {
+  const { error, formItemId } = useFormField()
+
+  return (
+    <Label
+      ref={ref}
+      className={cn(error && "text-destructive", className)}
+      htmlFor={formItemId}
+      {...props}
+    />
+  )
+})
+FormLabel.displayName = "FormLabel"
+
+const FormControl = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ ...props }, ref) => {
+  const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
+
+  return (
+    <div
+      ref={ref}
+      id={formItemId}
+      aria-describedby={
+        !error
+          ? `${formDescriptionId}`
+          : `${formDescriptionId} ${formMessageId}`
+      }
+      aria-invalid={!!error}
+      {...props}
+    />
+  )
+})
+FormControl.displayName = "FormControl"
+
+const FormDescription = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, ...props }, ref) => {
+  const { formDescriptionId } = useFormField()
+
+  return (
+    <p
+      ref={ref}
+      id={formDescriptionId}
+      className={cn("text-sm text-muted-foreground", className)}
+      {...props}
+    />
+  )
+})
+FormDescription.displayName = "FormDescription"
+
+const FormMessage = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, children, ...props }, ref) => {
+  const { error, formMessageId } = useFormField()
+  const body = error ? String(error?.message) : children
+
+  if (!body) {
+    return null
+  }
+
+  return (
+    <p
+      ref={ref}
+      id={formMessageId}
+      className={cn("text-sm font-medium text-destructive", className)}
+      {...props}
+    >
+      {body}
+    </p>
+  )
+})
+FormMessage.displayName = "FormMessage"
+
+export {
+  useFormField,
+  Form,
+  FormItem,
+  FormLabel,
+  FormControl,
+  FormDescription,
+  FormMessage,
+  FormField,
+}

package/templates/storefront-nextjs-shadcn/components/ui/index.ts

@@ -13,8 +13,21 @@ export {
   CardContent,
 } from './card';
 
-export { Select } from './select';
-export type { SelectProps } from './select';
+export {
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectLabel,
+  SelectScrollDownButton,
+  SelectScrollUpButton,
+  SelectSeparator,
+  SelectTrigger,
+  SelectValue,
+} from './select';
+
+export { Textarea } from './textarea';
+export type { TextareaProps } from './textarea';
 
 export { Badge } from './badge';
 export type { BadgeProps } from './badge';
@@ -54,6 +67,21 @@ export type {
 export { Pagination } from './pagination';
 export type { PaginationProps } from './pagination';
 
+export { Slider } from './slider';
+
+export {
+  Sheet,
+  SheetTrigger,
+  SheetClose,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  SheetDescription,
+} from './sheet';
+
+export { Progress } from './progress';
+export type { ProgressProps } from './progress';
+
 export { Spinner, SpinnerOverlay } from './spinner';
 export type { SpinnerProps, SpinnerOverlayProps } from './spinner';
 

package/templates/storefront-nextjs-shadcn/components/ui/progress.tsx

@@ -0,0 +1,40 @@
+"use client";
+
+import * as React from "react";
+import { cn } from "@/lib/utils";
+
+interface ProgressProps extends React.HTMLAttributes<HTMLDivElement> {
+  value?: number;
+  max?: number;
+}
+
+const Progress = React.forwardRef<HTMLDivElement, ProgressProps>(
+  ({ className, value = 0, max = 100, ...props }, ref) => {
+    const percentage = Math.min(Math.max((value / max) * 100, 0), 100);
+
+    return (
+      <div
+        ref={ref}
+        role="progressbar"
+        aria-valuemin={0}
+        aria-valuemax={max}
+        aria-valuenow={value}
+        className={cn(
+          "relative h-4 w-full overflow-hidden rounded-full bg-secondary",
+          className
+        )}
+        {...props}
+      >
+        <div
+          className="h-full w-full flex-1 bg-primary transition-all"
+          style={{ transform: `translateX(-${100 - percentage}%)` }}
+        />
+      </div>
+    );
+  }
+);
+
+Progress.displayName = "Progress";
+
+export { Progress };
+export type { ProgressProps };

package/templates/storefront-nextjs-shadcn/components/ui/sheet.tsx

@@ -0,0 +1,107 @@
+"use client";
+
+import * as React from "react";
+import * as DialogPrimitive from "@radix-ui/react-dialog";
+import { X } from "lucide-react";
+import { cn } from "@/lib/utils";
+
+const Sheet = DialogPrimitive.Root;
+const SheetTrigger = DialogPrimitive.Trigger;
+const SheetClose = DialogPrimitive.Close;
+const SheetPortal = DialogPrimitive.Portal;
+
+const SheetOverlay = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Overlay
+    ref={ref}
+    className={cn(
+      "fixed inset-0 z-50 bg-black/50 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+      className
+    )}
+    {...props}
+  />
+));
+SheetOverlay.displayName = DialogPrimitive.Overlay.displayName;
+
+interface SheetContentProps
+  extends React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> {
+  side?: "left" | "right";
+}
+
+const SheetContent = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Content>,
+  SheetContentProps
+>(({ side = "left", className, children, ...props }, ref) => (
+  <SheetPortal>
+    <SheetOverlay />
+    <DialogPrimitive.Content
+      ref={ref}
+      className={cn(
+        "fixed z-50 flex h-full flex-col gap-4 border bg-background shadow-lg transition-transform duration-300 ease-in-out",
+        side === "left" &&
+          "inset-y-0 left-0 w-3/4 max-w-sm border-r data-[state=closed]:-translate-x-full data-[state=open]:translate-x-0",
+        side === "right" &&
+          "inset-y-0 right-0 w-3/4 max-w-sm border-l data-[state=closed]:translate-x-full data-[state=open]:translate-x-0",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2">
+        <X className="h-4 w-4" />
+        <span className="sr-only">Close</span>
+      </DialogPrimitive.Close>
+    </DialogPrimitive.Content>
+  </SheetPortal>
+));
+SheetContent.displayName = "SheetContent";
+
+const SheetHeader = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col space-y-2 border-b border-border px-4 py-4",
+      className
+    )}
+    {...props}
+  />
+);
+SheetHeader.displayName = "SheetHeader";
+
+const SheetTitle = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Title
+    ref={ref}
+    className={cn("text-lg font-semibold text-foreground", className)}
+    {...props}
+  />
+));
+SheetTitle.displayName = DialogPrimitive.Title.displayName;
+
+const SheetDescription = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+));
+SheetDescription.displayName = DialogPrimitive.Description.displayName;
+
+export {
+  Sheet,
+  SheetTrigger,
+  SheetClose,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  SheetDescription,
+};

package/templates/storefront-nextjs-shadcn/components/ui/slider.tsx

@@ -0,0 +1,33 @@
+"use client";
+
+import * as React from "react";
+import * as SliderPrimitive from "@radix-ui/react-slider";
+import { cn } from "@/lib/utils";
+
+const Slider = React.forwardRef<
+  React.ElementRef<typeof SliderPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root>
+>(({ className, ...props }, ref) => (
+  <SliderPrimitive.Root
+    ref={ref}
+    className={cn(
+      "relative flex w-full touch-none select-none items-center",
+      className
+    )}
+    {...props}
+  >
+    <SliderPrimitive.Track className="relative h-2 w-full grow overflow-hidden rounded-full bg-secondary">
+      <SliderPrimitive.Range className="absolute h-full bg-primary" />
+    </SliderPrimitive.Track>
+    {(props.value ?? props.defaultValue ?? [0]).map((_: number, i: number) => (
+      <SliderPrimitive.Thumb
+        key={i}
+        className="block h-5 w-5 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50"
+      />
+    ))}
+  </SliderPrimitive.Root>
+));
+
+Slider.displayName = SliderPrimitive.Root.displayName;
+
+export { Slider };

package/templates/storefront-nextjs-shadcn/components/ui/textarea.tsx

@@ -0,0 +1,24 @@
+import * as React from "react"
+
+import { cn } from "@/lib/utils"
+
+export interface TextareaProps
+  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
+
+const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
+  ({ className, ...props }, ref) => {
+    return (
+      <textarea
+        className={cn(
+          "flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+          className
+        )}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+Textarea.displayName = "Textarea"
+
+export { Textarea }

package/templates/storefront-nextjs-shadcn/components/wishlist/wishlist-icon.tsx

@@ -13,6 +13,7 @@ import { Button } from '@/components/ui/button';
 import { Badge } from '@/components/ui/badge';
 import { cn } from '@/lib/utils';
 import { useWishlistStore } from '@/stores/wishlist-store';
+import { useHydrated } from '@doswiftly/storefront-sdk/react';
 
 interface WishlistIconProps {
   className?: string;
@@ -20,7 +21,8 @@ interface WishlistIconProps {
 }
 
 export function WishlistIcon({ className, showCount = true }: WishlistIconProps) {
-  const { getTotalItems, isHydrated } = useWishlistStore();
+  const { getTotalItems } = useWishlistStore();
+  const isHydrated = useHydrated();
 
   const totalItems = getTotalItems();