@vitnode/core 1.2.0-canary.22 → 1.2.0-canary.23

package/dist/src/lib/helpers/auto-form.test.js

@@ -117,6 +117,55 @@ describe('auto-form helpers', ()=>{
             const defaults = getDefaultValues(schema);
             expect(defaults).toEqual({});
         });
+        it('should handle complex default values with conditional logic', ()=>{
+            const data = {
+                category: {
+                    id: 123,
+                    title: 'Technology'
+                }
+            };
+            const schema = z.object({
+                title: z.string().default('Default Title'),
+                categoryId: z.object({
+                    value: z.string(),
+                    label: z.string()
+                }).default(data?.category ? {
+                    value: data.category.id.toString(),
+                    label: data.category.title
+                } : {
+                    value: '',
+                    label: ''
+                })
+            });
+            const defaults = getDefaultValues(schema);
+            expect(defaults).toEqual({
+                title: 'Default Title',
+                categoryId: {
+                    value: '123',
+                    label: 'Technology'
+                }
+            });
+        });
+        it('should handle complex default values with falsy data', ()=>{
+            // Test with a simpler approach - using a function that returns the default value
+            const getDefaultCategoryId = ()=>({
+                    value: '',
+                    label: ''
+                });
+            const schema = z.object({
+                categoryId: z.object({
+                    value: z.string(),
+                    label: z.string()
+                }).default(getDefaultCategoryId())
+            });
+            const defaults = getDefaultValues(schema);
+            expect(defaults).toEqual({
+                categoryId: {
+                    value: '',
+                    label: ''
+                }
+            });
+        });
         it('should return empty object for schema without shape', ()=>{
             const schema = z.string();
             const defaults = getDefaultValues(schema);

package/dist/src/views/admin/layouts/sidebar/nav/item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../../../../../../src/views/admin/layouts/sidebar/nav/item.tsx"],"names":[],"mappings":"AAoBA,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,YAAY,GAAI,+CAM1B,iBAAiB,GAAG;IACrB,KAAK,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,CAAC;CAC3C,4CA2EA,CAAC"}
+{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../../../../../../src/views/admin/layouts/sidebar/nav/item.tsx"],"names":[],"mappings":"AAoBA,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,YAAY,GAAI,+CAM1B,iBAAiB,GAAG;IACrB,KAAK,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,EAAE,CAAC;CAC3C,4CAuHA,CAAC"}

package/dist/src/views/admin/layouts/sidebar/nav/item.js

@@ -5,11 +5,22 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "../../../..
 import { SidebarMenuButton, useSidebar } from "../../../../../components/ui/sidebar.js";
 import { SidebarMenuItem, SidebarMenuSub, SidebarMenuSubButton, SidebarMenuSubItem } from "../../../../../components/ui/sidebar.js";
 import { useIsMobile } from "../../../../../hooks/use-mobile.js";
-import { Link } from "../../../../../lib/navigation.js";
+import { Link, usePathname } from "../../../../../lib/navigation.js";
 import { cn } from "../../../../../lib/utils.js";
 export const ItemNavAdmin = ({ href, title, icon, items = [], isOpenInNewTab })=>{
     const { toggleSidebar } = useSidebar();
     const isMobile = useIsMobile();
+    const pathname = usePathname();
+    // Helper function to normalize URLs for comparison
+    const normalizeUrl = (url)=>{
+        return url.endsWith('/') && url.length > 1 ? url.slice(0, -1) : url;
+    };
+    // Check if current path matches href (with normalization)
+    const isActive = normalizeUrl(pathname) === normalizeUrl(href);
+    // Check if any child item is active
+    const hasActiveChild = items.some((item)=>normalizeUrl(pathname) === normalizeUrl(item.href));
+    // Open collapsible by default if has active child
+    const defaultOpen = hasActiveChild;
     const content = /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
             icon ?? /*#__PURE__*/ _jsx(MenuIcon, {}),
@@ -22,8 +33,10 @@ export const ItemNavAdmin = ({ href, title, icon, items = [], isOpenInNewTab })=
         return /*#__PURE__*/ _jsx(SidebarMenuItem, {
             children: /*#__PURE__*/ _jsx(SidebarMenuButton, {
                 asChild: true,
+                isActive: isActive,
                 tooltip: title,
                 children: /*#__PURE__*/ _jsx(Link, {
+                    className: cn('relative', isActive && 'before:bg-primary before:absolute before:bottom-1 before:left-0 before:top-1 before:h-auto before:w-1 before:rounded-r-sm'),
                     href: href,
                     onClick: ()=>{
                         if (isMobile) {
@@ -41,11 +54,14 @@ export const ItemNavAdmin = ({ href, title, icon, items = [], isOpenInNewTab })=
     return /*#__PURE__*/ _jsx(Collapsible, {
         asChild: true,
         className: "group/collapsible",
+        defaultOpen: defaultOpen,
         children: /*#__PURE__*/ _jsxs(SidebarMenuItem, {
             children: [
                 /*#__PURE__*/ _jsx(CollapsibleTrigger, {
                     asChild: true,
                     children: /*#__PURE__*/ _jsxs(SidebarMenuButton, {
+                        className: cn('relative', (isActive || hasActiveChild) && 'before:bg-primary before:absolute before:bottom-1 before:left-0 before:top-1 before:h-auto before:w-1 before:rounded-r-sm'),
+                        isActive: isActive || hasActiveChild,
                         tooltip: title,
                         children: [
                             content,
@@ -58,10 +74,14 @@ export const ItemNavAdmin = ({ href, title, icon, items = [], isOpenInNewTab })=
                 /*#__PURE__*/ _jsx(CollapsibleContent, {
                     className: cn('text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 outline-none'),
                     children: /*#__PURE__*/ _jsx(SidebarMenuSub, {
-                        children: items.map((item)=>/*#__PURE__*/ _jsx(SidebarMenuSubItem, {
+                        children: items.map((item)=>{
+                            const isChildActive = normalizeUrl(pathname) === normalizeUrl(item.href);
+                            return /*#__PURE__*/ _jsx(SidebarMenuSubItem, {
                                 children: /*#__PURE__*/ _jsx(SidebarMenuSubButton, {
                                     asChild: true,
+                                    isActive: isChildActive,
                                     children: /*#__PURE__*/ _jsx(Link, {
+                                        className: cn('relative', isChildActive && 'before:bg-primary before:absolute before:bottom-1 before:left-0 before:top-1 before:h-auto before:w-1 before:rounded-r-sm'),
                                         href: item.href,
                                         onClick: ()=>{
                                             if (isMobile) {
@@ -74,7 +94,8 @@ export const ItemNavAdmin = ({ href, title, icon, items = [], isOpenInNewTab })=
                                         children: item.title
                                     })
                                 })
-                            }, item.href))
+                            }, item.href);
+                        })
                     })
                 })
             ]

package/dist/src/views/admin/views/core/dashboard/dashboard-admin-view.js

@@ -11,7 +11,7 @@ export const DashboardAdminView = async ()=>{
     if (!session) return null;
     const { vitnode_version } = session;
     return /*#__PURE__*/ _jsxs("div", {
-        className: "container mx-auto p-4",
+        className: "p-4",
         children: [
             /*#__PURE__*/ _jsx(HeaderContent, {
                 desc: t('version', {

package/dist/src/views/admin/views/core/test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../../../../src/views/admin/views/core/test.tsx"],"names":[],"mappings":"AAaA,eAAO,MAAM,QAAQ,+CA0IpB,CAAC"}
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../../../../src/views/admin/views/core/test.tsx"],"names":[],"mappings":"AAcA,eAAO,MAAM,QAAQ,+CA6IpB,CAAC"}

package/dist/src/views/admin/views/core/test.js

@@ -9,6 +9,7 @@ import { AutoFormRadioGroup } from "../../../../components/form/fields/radio-gro
 import { AutoFormSelect } from "../../../../components/form/fields/select.js";
 import { AutoFormSwitch } from "../../../../components/form/fields/switch.js";
 import { AutoFormTextarea } from "../../../../components/form/fields/textarea.js";
+import { Card } from "../../../../components/ui/card.js";
 export const TestView = ()=>{
     const formSchema = z.object({
         provider: z.string().min(1, {
@@ -37,110 +38,114 @@ export const TestView = ()=>{
         ])
     });
     return /*#__PURE__*/ _jsx("div", {
-        className: "container mx-auto p-4",
-        children: /*#__PURE__*/ _jsx(AutoForm, {
-            fields: [
-                {
-                    id: 'provider',
-                    component: (props)=>/*#__PURE__*/ _jsx(AutoFormInput, {
-                            description: "This is the provider for your application. It should be a valid provider name.",
-                            label: "Provider",
-                            ...props
-                        })
-                },
-                {
-                    id: 'client_secret',
-                    component: (props)=>/*#__PURE__*/ _jsx(AutoFormTextarea, {
-                            description: "This is the client secret for your application. It should be kept secret and not shared with anyone.",
-                            label: "Client Secret",
-                            ...props
-                        })
-                },
-                {
-                    id: 'terms',
-                    component: (props)=>/*#__PURE__*/ _jsx(AutoFormCheckbox, {
-                            description: "By checking this box, you agree to the terms and conditions.",
-                            label: "I agree to the terms and conditions",
-                            ...props
-                        })
-                },
-                {
-                    id: 'options',
-                    component: (props)=>/*#__PURE__*/ _jsx(AutoFormRadioGroup, {
-                            description: "By checking this box, you agree to the terms and conditions.",
-                            label: "I agree to the terms and conditions",
-                            labels: [
-                                {
-                                    value: 'option1',
-                                    label: 'Option 1 with a very long label that should be truncated'
-                                },
-                                {
-                                    value: 'option2',
-                                    label: 'Option 2'
-                                },
-                                {
-                                    value: 'option3',
-                                    label: 'Option 3'
-                                }
-                            ],
-                            ...props
-                        })
-                },
-                {
-                    id: 'options_long',
-                    component: (props)=>/*#__PURE__*/ _jsx(AutoFormSelect, {
-                            description: "By checking this box, you agree to the terms and conditions.",
-                            label: "I agree to the terms and conditions",
-                            labels: [
-                                {
-                                    value: 'option1',
-                                    label: 'Option 1 with a very long label that should be truncated'
-                                },
-                                {
-                                    value: 'option2',
-                                    label: 'Option 2'
-                                },
-                                {
-                                    value: 'option3',
-                                    label: 'Option 3'
-                                }
-                            ],
-                            placeholder: "Select an option from the list",
-                            ...props
-                        })
-                },
-                {
-                    id: 'switch',
-                    component: (props)=>/*#__PURE__*/ _jsx(AutoFormSwitch, {
-                            description: "By checking this box, you agree to the terms and conditions.",
-                            label: "I agree to the terms and conditions",
-                            ...props
-                        })
-                },
-                {
-                    id: 'type',
-                    component: (props)=>/*#__PURE__*/ _jsx(AutoFormCombobox, {
-                            description: "By checking this box, you agree to the terms and conditions.",
-                            label: "Type",
-                            labels: [
-                                {
-                                    value: 'option-one',
-                                    label: 'Option One'
-                                },
-                                {
-                                    value: 'option-two',
-                                    label: 'Option Two'
-                                }
-                            ],
-                            ...props
-                        })
+        className: "p-4",
+        children: /*#__PURE__*/ _jsx(Card, {
+            className: "p-6",
+            children: /*#__PURE__*/ _jsx(AutoForm, {
+                fields: [
+                    {
+                        id: 'provider',
+                        component: (props)=>/*#__PURE__*/ _jsx(AutoFormInput, {
+                                description: "This is the provider for your application. It should be a valid provider name.",
+                                label: "Provider",
+                                ...props
+                            })
+                    },
+                    {
+                        id: 'client_secret',
+                        component: (props)=>/*#__PURE__*/ _jsx(AutoFormTextarea, {
+                                description: "This is the client secret for your application. It should be kept secret and not shared with anyone.",
+                                label: "Client Secret",
+                                ...props
+                            })
+                    },
+                    {
+                        id: 'terms',
+                        component: (props)=>/*#__PURE__*/ _jsx(AutoFormCheckbox, {
+                                description: "By checking this box, you agree to the terms and conditions.",
+                                label: "I agree to the terms and conditions",
+                                ...props
+                            })
+                    },
+                    {
+                        id: 'options',
+                        component: (props)=>/*#__PURE__*/ _jsx(AutoFormRadioGroup, {
+                                description: "By checking this box, you agree to the terms and conditions.",
+                                label: "I agree to the terms and conditions",
+                                labels: [
+                                    {
+                                        value: 'option1',
+                                        label: 'Option 1 with a very long label that should be truncated'
+                                    },
+                                    {
+                                        value: 'option2',
+                                        label: 'Option 2'
+                                    },
+                                    {
+                                        value: 'option3',
+                                        label: 'Option 3'
+                                    }
+                                ],
+                                ...props
+                            })
+                    },
+                    {
+                        id: 'options_long',
+                        component: (props)=>/*#__PURE__*/ _jsx(AutoFormSelect, {
+                                description: "By checking this box, you agree to the terms and conditions.",
+                                label: "I agree to the terms and conditions",
+                                labels: [
+                                    {
+                                        value: 'option1',
+                                        label: 'Option 1 with a very long label that should be truncated'
+                                    },
+                                    {
+                                        value: 'option2',
+                                        label: 'Option 2'
+                                    },
+                                    {
+                                        value: 'option3',
+                                        label: 'Option 3'
+                                    }
+                                ],
+                                placeholder: "Select an option from the list",
+                                ...props
+                            })
+                    },
+                    {
+                        id: 'switch',
+                        component: (props)=>/*#__PURE__*/ _jsx(AutoFormSwitch, {
+                                description: "By checking this box, you agree to the terms and conditions.",
+                                label: "I agree to the terms and conditions",
+                                ...props
+                            })
+                    },
+                    {
+                        id: 'type',
+                        component: (props)=>/*#__PURE__*/ _jsx(AutoFormCombobox, {
+                                description: "By checking this box, you agree to the terms and conditions.",
+                                label: "Type",
+                                labels: [
+                                    {
+                                        value: 'option-one',
+                                        label: 'Option One'
+                                    },
+                                    {
+                                        value: 'option-two',
+                                        label: 'Option Two'
+                                    }
+                                ],
+                                ...props
+                            })
+                    }
+                ],
+                formSchema: formSchema,
+                onSubmit: async (values)=>{
+                    // eslint-disable-next-line no-console
+                    console.log('Form submitted', values);
+                    await new Promise((resolve)=>setTimeout(resolve, 3000));
                 }
-            ],
-            formSchema: formSchema,
-            onSubmit: (values)=>{
-                // eslint-disable-next-line no-console
-                console.log('Form submitted', values);
-            }
+            })
         })
     });
 };

package/dist/src/views/layouts/theme/header/header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../../../src/views/layouts/theme/header/header.tsx"],"names":[],"mappings":"AASA,eAAO,MAAM,YAAY,GAAI,+BAI1B,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,4CAqB5D,CAAC"}
+{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../../../src/views/layouts/theme/header/header.tsx"],"names":[],"mappings":"AASA,eAAO,MAAM,YAAY,GAAI,+BAI1B,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG;IAAE,IAAI,EAAE,KAAK,CAAC,SAAS,CAAA;CAAE,4CAuB5D,CAAC"}

package/dist/src/views/layouts/theme/header/header.js

@@ -6,27 +6,30 @@ import { Link } from "../../../../lib/navigation.js";
 import { cn } from "../../../../lib/utils.js";
 import { UserHeader } from "./user/user.js";
 export const HeaderLayout = ({ logo, className, ...props })=>{
-    return /*#__PURE__*/ _jsxs("header", {
-        className: cn('bg-background/75 container sticky top-0 z-20 mx-auto flex w-full items-center border-b px-4 py-2 backdrop-blur sm:top-2 sm:rounded-xl sm:border', className),
+    return /*#__PURE__*/ _jsx("header", {
+        className: cn('bg-card/75 sticky top-0 z-20 w-full border-b shadow-sm backdrop-blur', className),
         ...props,
-        children: [
-            /*#__PURE__*/ _jsx(Link, {
-                href: "/",
-                prefetch: true,
-                children: logo
-            }),
-            /*#__PURE__*/ _jsxs("div", {
-                className: "ml-auto flex items-center gap-2",
-                children: [
-                    /*#__PURE__*/ _jsx(ThemeSwitcher, {}),
-                    /*#__PURE__*/ _jsx(Suspense, {
-                        fallback: /*#__PURE__*/ _jsx(Skeleton, {
-                            className: "h-9 w-32"
-                        }),
-                        children: /*#__PURE__*/ _jsx(UserHeader, {})
-                    })
-                ]
-            })
-        ]
+        children: /*#__PURE__*/ _jsxs("div", {
+            className: "container mx-auto flex h-14 items-center px-4 py-2",
+            children: [
+                /*#__PURE__*/ _jsx(Link, {
+                    href: "/",
+                    prefetch: true,
+                    children: logo
+                }),
+                /*#__PURE__*/ _jsxs("div", {
+                    className: "ml-auto flex items-center gap-2",
+                    children: [
+                        /*#__PURE__*/ _jsx(ThemeSwitcher, {}),
+                        /*#__PURE__*/ _jsx(Suspense, {
+                            fallback: /*#__PURE__*/ _jsx(Skeleton, {
+                                className: "h-9 w-32"
+                            }),
+                            children: /*#__PURE__*/ _jsx(UserHeader, {})
+                        })
+                    ]
+                })
+            ]
+        })
     });
 };