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

package/dist/src/lib/fetcher-client.d.ts

@@ -0,0 +1,8 @@
+import type { BaseBuildModuleReturn, BuildModuleReturn } from '../api/lib/module';
+import type { Route } from '../api/lib/route';
+import type { FetcherParams, GetModulePaths, GetValidMethodForPath, GetValidPathsForModule, InferResponseType } from './fetcher/types';
+export declare function fetcherClient<M extends string, Routes extends Route[], Modules extends BaseBuildModuleReturn[], ModuleName extends GetModulePaths<M, Modules>, SelectedPath extends GetValidPathsForModule<ModuleName, M, Routes, Modules>, Method extends GetValidMethodForPath<ModuleName, SelectedPath, M, Routes, Modules> = GetValidMethodForPath<ModuleName, SelectedPath, M, Routes, Modules>>(moduleReturn: BuildModuleReturn<string, M, Routes, Modules>, { path, method, module, args, options, withPagination, }: FetcherParams<M, Routes, Modules, ModuleName, SelectedPath, Method> & {
+    options?: Omit<RequestInit, 'body'>;
+    withPagination?: boolean;
+}): Promise<InferResponseType<M, Routes, Modules, ModuleName, SelectedPath, Method>>;
+//# sourceMappingURL=fetcher-client.d.ts.map

package/dist/src/lib/fetcher-client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetcher-client.d.ts","sourceRoot":"","sources":["../../../src/lib/fetcher-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAIzB,wBAAsB,aAAa,CACjC,CAAC,SAAS,MAAM,EAChB,MAAM,SAAS,KAAK,EAAE,EACtB,OAAO,SAAS,qBAAqB,EAAE,EACvC,UAAU,SAAS,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,EAC7C,YAAY,SAAS,sBAAsB,CAAC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAC3E,MAAM,SAAS,qBAAqB,CAClC,UAAU,EACV,YAAY,EACZ,CAAC,EACD,MAAM,EACN,OAAO,CACR,GAAG,qBAAqB,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAEvE,YAAY,EAAE,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAC3D,EACE,IAAI,EACJ,MAAM,EACN,MAAM,EACN,IAAI,EACJ,OAAO,EACP,cAAsB,GACvB,EAAE,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,GAAG;IACvE,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CACR,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,CACxE,CASA"}

package/dist/src/lib/fetcher-client.js

@@ -0,0 +1,11 @@
+import { coreFetcher } from "./fetcher/core.js";
+export async function fetcherClient(moduleReturn, { path, method, module, args, options, withPagination = false }) {
+    return coreFetcher(moduleReturn, {
+        path,
+        method,
+        module,
+        args,
+        options,
+        withPagination
+    });
+}

package/dist/src/lib/fetcher.d.ts

@@ -1,7 +1,8 @@
+import 'server-only';
 import type { BaseBuildModuleReturn, BuildModuleReturn } from '../api/lib/module';
 import type { Route } from '../api/lib/route';
 import type { FetcherParams, GetModulePaths, GetValidMethodForPath, GetValidPathsForModule, InferResponseType } from './fetcher/types';
-export declare function fetcher<M extends string, Routes extends Route[], Modules extends BaseBuildModuleReturn[], ModuleName extends GetModulePaths<M, Modules>, SelectedPath extends GetValidPathsForModule<ModuleName, M, Routes, Modules>, Method extends GetValidMethodForPath<ModuleName, SelectedPath, M, Routes, Modules> = GetValidMethodForPath<ModuleName, SelectedPath, M, Routes, Modules>>({ pluginId }: BuildModuleReturn<string, M, Routes, Modules>, { path, method, module, args, options, allowSaveCookies, withPagination, }: FetcherParams<M, Routes, Modules, ModuleName, SelectedPath, Method> & {
+export declare function fetcher<M extends string, Routes extends Route[], Modules extends BaseBuildModuleReturn[], ModuleName extends GetModulePaths<M, Modules>, SelectedPath extends GetValidPathsForModule<ModuleName, M, Routes, Modules>, Method extends GetValidMethodForPath<ModuleName, SelectedPath, M, Routes, Modules> = GetValidMethodForPath<ModuleName, SelectedPath, M, Routes, Modules>>(moduleReturn: BuildModuleReturn<string, M, Routes, Modules>, { path, method, module, args, options, allowSaveCookies, withPagination, }: FetcherParams<M, Routes, Modules, ModuleName, SelectedPath, Method> & {
     allowSaveCookies?: boolean;
     options?: Omit<RequestInit, 'body'>;
     withPagination?: boolean;

package/dist/src/lib/fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetcher.d.ts","sourceRoot":"","sources":["../../../src/lib/fetcher.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAKzB,wBAAsB,OAAO,CAC3B,CAAC,SAAS,MAAM,EAChB,MAAM,SAAS,KAAK,EAAE,EACtB,OAAO,SAAS,qBAAqB,EAAE,EACvC,UAAU,SAAS,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,EAC7C,YAAY,SAAS,sBAAsB,CAAC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAC3E,MAAM,SAAS,qBAAqB,CAClC,UAAU,EACV,YAAY,EACZ,CAAC,EACD,MAAM,EACN,OAAO,CACR,GAAG,qBAAqB,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAEvE,EAAE,QAAQ,EAAE,EAAE,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAC3D,EACE,IAAI,EACJ,MAAM,EACN,MAAM,EACN,IAAI,EACJ,OAAO,EACP,gBAAwB,EACxB,cAAsB,GACvB,EAAE,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,GAAG;IACvE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CACR,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,CACxE,CA+DA"}
+{"version":3,"file":"fetcher.d.ts","sourceRoot":"","sources":["../../../src/lib/fetcher.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,CAAC;AAGrB,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAKzB,wBAAsB,OAAO,CAC3B,CAAC,SAAS,MAAM,EAChB,MAAM,SAAS,KAAK,EAAE,EACtB,OAAO,SAAS,qBAAqB,EAAE,EACvC,UAAU,SAAS,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC,EAC7C,YAAY,SAAS,sBAAsB,CAAC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAC3E,MAAM,SAAS,qBAAqB,CAClC,UAAU,EACV,YAAY,EACZ,CAAC,EACD,MAAM,EACN,OAAO,CACR,GAAG,qBAAqB,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAEvE,YAAY,EAAE,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAC3D,EACE,IAAI,EACJ,MAAM,EACN,MAAM,EACN,IAAI,EACJ,OAAO,EACP,gBAAwB,EACxB,cAAsB,GACvB,EAAE,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,GAAG;IACvE,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACpC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CACR,iBAAiB,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,CACxE,CA+BA"}

package/dist/src/lib/fetcher.js

@@ -1,45 +1,26 @@
+import "server-only";
 import { cookies, headers } from "next/headers";
-import { CONFIG } from "./config.js";
-import { buildSearchParams, handleSetCookiesFetcher } from "./fetcher/helpers.js";
-export async function fetcher({ pluginId }, { path, method, module, args, options, allowSaveCookies = false, withPagination = false }) {
-    let currentPath = path;
-    // Replace path parameters
-    if (args && 'params' in args && args.params) {
-        for (const [key, value] of Object.entries(args.params)){
-            currentPath = currentPath.replaceAll(`{${key}}`, String(value));
-        }
-    }
-    // Ensure path starts with a slash
-    const formattedPath = currentPath.startsWith('/') ? currentPath : `/${currentPath}`;
-    // Construct the base URL
-    const url = new URL(`/api/${pluginId}/${module}${formattedPath}`, CONFIG.backend.origin);
-    // Add query parameters if they exist
-    if (args && 'query' in args && args.query) {
-        const queryParams = args.query;
-        const searchParams = buildSearchParams({
-            ...args.query,
-            ...withPagination && {
-                first: !queryParams.last ? queryParams.first ?? '10' : undefined,
-                search: queryParams.search ?? ''
-            }
-        });
-        url.search = searchParams.toString();
-    }
+import { coreFetcher } from "./fetcher/core.js";
+import { handleSetCookiesFetcher } from "./fetcher/helpers-server.js";
+export async function fetcher(moduleReturn, { path, method, module, args, options, allowSaveCookies = false, withPagination = false }) {
     const [nextInternalHeaders, cookie] = await Promise.all([
         headers(),
         cookies()
     ]);
-    const response = await fetch(url, {
-        method: method.toUpperCase(),
-        headers: new Headers({
-            'Content-Type': 'application/json',
+    const response = await coreFetcher(moduleReturn, {
+        path,
+        method,
+        module,
+        args,
+        options,
+        withPagination,
+        additionalHeaders: {
             Cookie: cookie.toString(),
             ['user-agent']: nextInternalHeaders.get('user-agent') ?? 'node',
             ['x-forwarded-for']: nextInternalHeaders.get('x-forwarded-for') ?? '0.0.0.0'
-        }),
-        body: args && 'body' in args ? JSON.stringify(args.body) : undefined,
-        ...options
+        }
     });
+    // Handle cookies on server-side for successful responses
     if (response.status >= 200 && response.status < 300 && allowSaveCookies) {
         await handleSetCookiesFetcher(response);
     }

package/dist/src/lib/helpers/auto-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-form.d.ts","sourceRoot":"","sources":["../../../../src/lib/helpers/auto-form.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,EAC7E,IAAI,MAAM,KACT,IAAI,GAAG,CAAC,CAAC,MAMX,CAAC;AAGF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEpD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,kBAAkB,GAEzB,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAUvB;AAMD,wBAAgB,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC,UAAU,EAClD,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAC3B,OAAO,CAAC,EAAE,OAAO,GAChB,IAAI,GAAG,CAAC,CAYV;AAMD,eAAO,MAAM,WAAW,GAAI,QAAQ,CAAC,CAAC,UAAU,KAAG,MAIlD,CAAC;AAKF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,GAAG,OAAO,CAevE;AAMD,wBAAgB,gBAAgB,CAAC,MAAM,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EACnE,MAAM,EAAE,MAAM,GACb,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAmC1C"}
+{"version":3,"file":"auto-form.d.ts","sourceRoot":"","sources":["../../../../src/lib/helpers/auto-form.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,EAC7E,IAAI,MAAM,KACT,IAAI,GAAG,CAAC,CAAC,MAMX,CAAC;AAGF,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEpD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,kBAAkB,GAEzB,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAUvB;AAMD,wBAAgB,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC,UAAU,EAClD,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAC3B,OAAO,CAAC,EAAE,OAAO,GAChB,IAAI,GAAG,CAAC,CAYV;AAMD,eAAO,MAAM,WAAW,GAAI,QAAQ,CAAC,CAAC,UAAU,KAAG,MAIlD,CAAC;AAKF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,GAAG,OAAO,CA2CvE;AAMD,wBAAgB,gBAAgB,CAAC,MAAM,SAAS,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EACnE,MAAM,EAAE,MAAM,GACb,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CA8B1C"}

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

@@ -37,17 +37,33 @@ export function getObjectFormSchema(schema) {
     return baseSchema ? baseSchema._def.typeName : '';
 };
 /**
- * Search for a "ZodDefult" in the Zod stack and return its value.
+ * Search for a "ZodDefault" in the Zod stack and return its value.
  */ export function getDefaultValueInZodStack(schema) {
+    // Check if this is a ZodDefault and return its value
     if (schema._def.typeName === z.ZodFirstPartyTypeKind.ZodDefault) {
-        return schema._def.defaultValue();
+        const defaultValue = schema._def.defaultValue();
+        // If defaultValue is a function, call it to get the actual value
+        return typeof defaultValue === 'function' ? defaultValue() : defaultValue;
     }
-    if ('innerType' in schema._def) {
-        return getDefaultValueInZodStack(schema._def.innerType);
+    // Traverse through ZodEffects (like refinements) - check this first as it wraps the actual schema
+    if (schema._def.typeName === z.ZodFirstPartyTypeKind.ZodEffects) {
+        return getDefaultValueInZodStack(schema._def.schema);
     }
+    // Traverse through other types that have schema property
     if ('schema' in schema._def) {
         return getDefaultValueInZodStack(schema._def.schema);
     }
+    // Traverse through ZodOptional, ZodNullable, etc.
+    if ('innerType' in schema._def) {
+        return getDefaultValueInZodStack(schema._def.innerType);
+    }
+    // Traverse through ZodArray's element type
+    if ('type' in schema._def && schema._def.typeName === z.ZodFirstPartyTypeKind.ZodArray) {
+        const innerDefault = getDefaultValueInZodStack(schema._def.type);
+        return innerDefault !== undefined ? [
+            innerDefault
+        ] : undefined;
+    }
     return undefined;
 }
 /**
@@ -59,23 +75,19 @@ export function getDefaultValues(schema) {
     if (!shape) return defaultValues;
     for (const key of Object.keys(shape)){
         const item = shape[key];
-        if (getBaseType(item) === 'ZodObject') {
+        // First, try to get any default value from the current item (including nested defaults)
+        const defaultValue = getDefaultValueInZodStack(item);
+        if (defaultValue !== undefined) {
+            defaultValues[key] = defaultValue;
+        } else if (getBaseType(item) === 'ZodObject') {
+            // Only recurse into object shape if there's no default value at the current level
             const baseSchema = getBaseSchema(item);
             if (baseSchema && 'shape' in baseSchema._def) {
                 const defaultItems = getDefaultValues(baseSchema);
-                if (defaultItems !== null) {
-                    const obj = {};
-                    for (const defaultItemKey of Object.keys(defaultItems)){
-                        obj[defaultItemKey] = defaultItems[defaultItemKey];
-                        defaultValues[key] = obj;
-                    }
+                if (defaultItems && Object.keys(defaultItems).length > 0) {
+                    defaultValues[key] = defaultItems;
                 }
             }
-        } else {
-            const defaultValue = getDefaultValueInZodStack(item);
-            if (defaultValue !== undefined) {
-                defaultValues[key] = defaultValue;
-            }
         }
     }
     return defaultValues;

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":"AAmBA,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,4CA8DA,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

@@ -2,11 +2,25 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { ChevronRight, MenuIcon } from "lucide-react";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "../../../../../components/ui/collapsible.js";
-import { SidebarMenuButton } from "../../../../../components/ui/sidebar.js";
+import { SidebarMenuButton, useSidebar } from "../../../../../components/ui/sidebar.js";
 import { SidebarMenuItem, SidebarMenuSub, SidebarMenuSubButton, SidebarMenuSubItem } from "../../../../../components/ui/sidebar.js";
-import { Link } from "../../../../../lib/navigation.js";
+import { useIsMobile } from "../../../../../hooks/use-mobile.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, {}),
@@ -19,9 +33,16 @@ 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) {
+                            toggleSidebar();
+                        }
+                    },
                     prefetch: true,
                     rel: isOpenInNewTab ? 'noopener noreferrer' : undefined,
                     target: isOpenInNewTab ? '_blank' : undefined,
@@ -33,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,
@@ -50,18 +74,28 @@ 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) {
+                                                toggleSidebar();
+                                            }
+                                        },
                                         prefetch: true,
                                         rel: item.isOpenInNewTab ? 'noopener noreferrer' : undefined,
                                         target: item.isOpenInNewTab ? '_blank' : undefined,
                                         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/auth/sign-in/form/form.js

@@ -5,7 +5,7 @@ import { useTranslations } from "next-intl";
 import { AutoForm } from "../../../../components/form/auto-form.js";
 import { AutoFormInput } from "../../../../components/form/fields/input.js";
 import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert.js";
-import { useFormSignIn } from "./hooks/use-form.js";
+import { useFormSignIn } from "./use-form.js";
 export const FormSignIn = ({ isAdmin })=>{
     const t = useTranslations('core.auth.sign_in');
     const { onSubmit, error, formSchema } = useFormSignIn({

package/dist/src/views/auth/sign-in/form/{hooks/mutation-api.d.ts → mutation-api.d.ts}

@@ -1,5 +1,5 @@
 import type { z } from 'zod';
-import type { zodSignInSchema } from '../../../../../api/modules/users/routes/sign-in.route';
+import type { zodSignInSchema } from '../../../../api/modules/users/routes/sign-in.route';
 export declare const mutationApi: (input: z.infer<typeof zodSignInSchema> & {
     isAdmin?: boolean;
 }) => Promise<{

package/dist/src/views/auth/sign-in/form/mutation-api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mutation-api.d.ts","sourceRoot":"","sources":["../../../../../../src/views/auth/sign-in/form/mutation-api.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAI7B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAMhF,eAAO,MAAM,WAAW,GACtB,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,GAAG;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;;;;cA6BF,CAAC"}

package/dist/src/views/auth/sign-in/form/{hooks/mutation-api.js → mutation-api.js}

@@ -1,8 +1,8 @@
 'use server';
 import { revalidatePath } from "next/cache";
-import { usersModule } from "../../../../../api/modules/users/users.module.js";
-import { fetcher } from "../../../../../lib/fetcher.js";
-import { redirect } from "../../../../../lib/navigation.js";
+import { usersModule } from "../../../../api/modules/users/users.module.js";
+import { fetcher } from "../../../../lib/fetcher.js";
+import { redirect } from "../../../../lib/navigation.js";
 export const mutationApi = async (input)=>{
     const res = await fetcher(usersModule, {
         path: '/sign_in',

package/dist/src/views/auth/sign-in/form/use-form.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-form.d.ts","sourceRoot":"","sources":["../../../../../../src/views/auth/sign-in/form/use-form.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,aAAa,GAAI,aAAa;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE;uBAe9B,CAAC,CAAC,KAAK;;;;;;;;;OAAmB;;;;;;;;;;;;CAiB3D,CAAC"}