@airoom/nextmin-react 2.0.2 → 2.0.3

package/dist/components/editor/extensions/FontSize.js

@@ -0,0 +1,41 @@
+import { Extension } from '@tiptap/core';
+export const FontSize = Extension.create({
+    name: 'fontSize',
+    addOptions() {
+        return {
+            types: ['textStyle'],
+        };
+    },
+    addGlobalAttributes() {
+        return [
+            {
+                types: this.options.types,
+                attributes: {
+                    fontSize: {
+                        default: null,
+                        parseHTML: element => element.style.fontSize?.replace(/['"]/g, '') || null,
+                        renderHTML: attributes => {
+                            if (!attributes.fontSize) {
+                                return {};
+                            }
+                            return {
+                                style: `font-size: ${attributes.fontSize}`,
+                            };
+                        },
+                    },
+                },
+            },
+        ];
+    },
+    addCommands() {
+        return {
+            setFontSize: (fontSize) => ({ chain }) => {
+                const formatted = typeof fontSize === 'number' || /^\d+$/.test(fontSize) ? `${fontSize}px` : fontSize;
+                return chain().setMark('textStyle', { fontSize: formatted }).run();
+            },
+            unsetFontSize: () => ({ chain }) => {
+                return chain().setMark('textStyle', { fontSize: null }).removeEmptyTextStyle().run();
+            },
+        };
+    },
+});

package/dist/components/viewer/DynamicViewer.js

@@ -52,25 +52,46 @@ function isLikelyImageUrl(s) {
         return IMG_EXT_RE.test(path.split('.').pop() || '');
     }
 }
-function extractUrl(v) {
+function isImageKeyOrAttr(key, attr) {
+    if (key) {
+        const k = key.toLowerCase();
+        if (['image', 'img', 'avatar', 'photo', 'thumbnail', 'logo', 'cover', 'banner', 'pic', 'picture', 'icon'].some((term) => k.includes(term))) {
+            return true;
+        }
+    }
+    const a = Array.isArray(attr) ? attr[0] : attr;
+    const t = String(a?.type ?? '').toLowerCase();
+    const f = String(a?.format ?? '').toLowerCase();
+    return t === 'image' || f === 'image' || t === 'media' || f === 'media';
+}
+function extractUrl(v, key, attr) {
     if (!v)
         return null;
-    if (typeof v === 'string' && isLikelyImageUrl(v))
-        return v;
+    if (typeof v === 'string') {
+        if (isLikelyImageUrl(v))
+            return v;
+        if (isImageKeyOrAttr(key, attr) && isUrlLike(v))
+            return v;
+    }
     if (typeof v === 'object') {
         const u = (v.url || v.src || v.value);
-        return u && isLikelyImageUrl(u) ? u : null;
+        if (u) {
+            if (isLikelyImageUrl(u))
+                return u;
+            if (isImageKeyOrAttr(key, attr) && isUrlLike(u))
+                return u;
+        }
     }
     return null;
 }
-function extractAllImageUrls(val) {
+function extractAllImageUrls(val, key, attr) {
     if (Array.isArray(val)) {
-        const list = val.map(extractUrl).filter(Boolean);
+        const list = val.map((item) => extractUrl(item, key, attr)).filter(Boolean);
         if (list.length)
             return list;
-        return (val.filter((s) => typeof s === 'string' && isLikelyImageUrl(s)) || []);
+        return (val.filter((s) => typeof s === 'string' && (isLikelyImageUrl(s) || (isImageKeyOrAttr(key, attr) && isUrlLike(s)))) || []);
     }
-    const one = extractUrl(val);
+    const one = extractUrl(val, key, attr);
     return one ? [one] : [];
 }
 function humanizeLabel(key) {
@@ -275,7 +296,7 @@ function renderValue(input, key, attr) {
     if (localizedTime)
         return _jsx("span", { children: localizedTime });
     // Detect images
-    const urls = extractAllImageUrls(val);
+    const urls = extractAllImageUrls(val, key, attr);
     if (urls.length)
         return _jsx(ImageThumbs, { urls: urls });
     // Primitive or simple object/array formatting via shared formatter
@@ -319,17 +340,31 @@ function ObjectView({ obj, attributes, showKey }) {
 export function DynamicViewer({ schema, data }) {
     // Use schema order if available, otherwise object keys order
     const attributes = (schema?.attributes ?? {});
+    // Detect if this is a User-extending schema with no linked user
+    const isUserExt = schema?.extends?.toLowerCase() === 'users';
+    const hasLinkedUser = !!(data?.exId || data?.baseId);
     const keys = React.useMemo(() => {
-        const base = Object.keys(attributes).filter((k) => {
+        const attrKeys = Object.keys(attributes).filter((k) => {
             if (HIDDEN_KEYS.has(k) || isPasswordKeyRaw(k))
                 return false;
             if (isPasswordByAttr(attributes[k]))
                 return false;
-            return !isPrivate(attributes[k]);
+            if (isPrivate(attributes[k]))
+                return false;
+            // Hide inherited fields when no base user is linked
+            if (isUserExt && !hasLinkedUser) {
+                const head = Array.isArray(attributes[k]) ? attributes[k][0] : attributes[k];
+                if (head?.inherited)
+                    return false;
+            }
+            return true;
+        });
+        const extraDataKeys = Object.keys(data || {}).filter((k) => {
+            if (HIDDEN_KEYS.has(k) || isPasswordKeyRaw(k))
+                return false;
+            return !attrKeys.includes(k);
         });
-        if (base.length)
-            return base;
-        return Object.keys(data || {}).filter((k) => !HIDDEN_KEYS.has(k) && !isPasswordKeyRaw(k));
-    }, [attributes, data]);
+        return [...attrKeys, ...extraDataKeys];
+    }, [attributes, data, isUserExt, hasLinkedUser]);
     return (_jsx("div", { className: "grid gap-1", children: keys.map((key) => (_jsx(FieldRow, { label: humanizeLabel(key), children: renderValue(data?.[key], key, attributes[key]) }, key))) }));
 }

package/dist/components/viewer/useViewDrawer.js

@@ -1,8 +1,48 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
-import { Drawer, DrawerBody, DrawerContent, DrawerFooter, DrawerHeader, Button, } from '@heroui/react';
+import { Drawer, DrawerBody, DrawerContent, DrawerFooter, DrawerHeader, Button, Spinner, } from '@heroui/react';
+import { api } from '../../lib/api';
 import { DynamicViewer } from './DynamicViewer';
+function ViewDrawerContent({ model, schema, data: initialData, }) {
+    const [data, setData] = React.useState(initialData);
+    const [loading, setLoading] = React.useState(false);
+    React.useEffect(() => {
+        setData(initialData);
+        const id = initialData?.id || initialData?._id;
+        if (!model || !id)
+            return;
+        let cancelled = false;
+        setLoading(true);
+        api
+            .get(model, String(id))
+            .then((res) => {
+            if (cancelled)
+                return;
+            const fetched = res?.data || res;
+            if (fetched && typeof fetched === 'object') {
+                let merged = { ...initialData, ...fetched };
+                const baseObj = fetched?.baseId;
+                if (baseObj && typeof baseObj === 'object') {
+                    merged = { ...baseObj, ...merged };
+                    delete merged.baseId;
+                }
+                setData(merged);
+            }
+        })
+            .catch((err) => {
+            console.error('Failed to fetch full record for view drawer:', err);
+        })
+            .finally(() => {
+            if (!cancelled)
+                setLoading(false);
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [model, initialData?.id, initialData?._id]);
+    return (_jsxs("div", { className: "relative", children: [loading && (_jsxs("div", { className: "mb-3 flex items-center gap-2 text-xs text-primary font-medium", children: [_jsx(Spinner, { size: "sm" }), " Loading full details..."] })), _jsx(DynamicViewer, { schema: schema, data: data })] }));
+}
 export function useViewDrawer() {
     const [state, setState] = React.useState(null);
     const open = React.useCallback((params) => {
@@ -18,7 +58,7 @@ export function useViewDrawer() {
             return null;
         const { isOpen, title, model, schema, data } = state;
         const headerTitle = title || model || 'Details';
-        return (_jsx(Drawer, { isOpen: isOpen, onClose: close, placement: "right", size: "lg", children: _jsxs(DrawerContent, { className: "w-[100vw] md:max-w-[50vw]", children: [_jsx(DrawerHeader, { className: "border-b border-default-200", children: headerTitle }), _jsx(DrawerBody, { className: "px-4 py-3", children: _jsx(DynamicViewer, { schema: schema, data: data }) }), _jsx(DrawerFooter, { className: "border-t border-default-200", children: _jsx(Button, { variant: "flat", onPress: close, children: "Close" }) })] }) }));
+        return (_jsx(Drawer, { isOpen: isOpen, onClose: close, placement: "right", size: "lg", children: _jsxs(DrawerContent, { className: "w-[100vw] md:max-w-[50vw]", children: [_jsx(DrawerHeader, { className: "border-b border-default-200", children: headerTitle }), _jsx(DrawerBody, { className: "px-4 py-3 overflow-y-auto", children: _jsx(ViewDrawerContent, { model: model, schema: schema, data: data }) }), _jsx(DrawerFooter, { className: "border-t border-default-200", children: _jsx(Button, { variant: "flat", onPress: close, children: "Close" }) })] }) }));
     }, [state, close]);
     return { open, close, ViewDrawerPortal };
 }

package/dist/hooks/useAppNavigation.d.ts

@@ -0,0 +1,3 @@
+export declare function useAppNavigation(): (url: string, opts?: {
+    replace?: boolean;
+}) => void;

package/dist/hooks/useAppNavigation.js

@@ -0,0 +1,37 @@
+'use client';
+import { useCallback } from 'react';
+import { useRouter } from 'next/navigation';
+import { useNextMin } from '../providers/NextMinProvider';
+export function useAppNavigation() {
+    const { navigate } = useNextMin();
+    const router = useRouter();
+    return useCallback((url, opts) => {
+        if (navigate) {
+            navigate(url);
+        }
+        else if (router) {
+            if (opts?.replace && typeof router.replace === 'function') {
+                router.replace(url);
+            }
+            else if (typeof router.push === 'function') {
+                router.push(url);
+            }
+            else if (typeof window !== 'undefined') {
+                if (opts?.replace) {
+                    window.location.replace(url);
+                }
+                else {
+                    window.location.href = url;
+                }
+            }
+        }
+        else if (typeof window !== 'undefined') {
+            if (opts?.replace) {
+                window.location.replace(url);
+            }
+            else {
+                window.location.href = url;
+            }
+        }
+    }, [navigate, router]);
+}

package/dist/index.d.ts

@@ -2,7 +2,9 @@ export * from './providers/NextMinProvider';
 export * from './components/AdminApp';
 export * from './components/ArchitectureDemo';
 export * from './hooks/useRealtime';
+export * from './hooks/useAppNavigation';
 export * from './lib/QueryBuilder';
 export * from './lib/AuthClient';
 export * from './lib/RealtimeClient';
 export * from './lib/api';
+export type { ThemeConfig } from './providers/themeResolver';

package/dist/index.js

@@ -2,6 +2,7 @@ export * from './providers/NextMinProvider';
 export * from './components/AdminApp';
 export * from './components/ArchitectureDemo';
 export * from './hooks/useRealtime';
+export * from './hooks/useAppNavigation';
 export * from './lib/QueryBuilder';
 export * from './lib/AuthClient';
 export * from './lib/RealtimeClient';

package/dist/lib/QueryBuilder.d.ts

@@ -10,7 +10,8 @@ export interface QueryOptions {
     sortType?: string;
     page?: number;
     limit?: number;
-    fields?: string[];
+    fields?: string | string[];
+    select?: string | string[];
     q?: string;
     searchKeys?: string;
 }
@@ -21,6 +22,7 @@ export declare class QueryBuilder {
     private options;
     where(field: string, operator: FilterOperator, value: any): QueryBuilder;
     orWhere(field: string, operator: FilterOperator, value: any): QueryBuilder;
+    select(fields: string | string[]): QueryBuilder;
     sort(field: string, direction?: 'asc' | 'desc'): QueryBuilder;
     page(page: number, limit?: number): QueryBuilder;
     limit(limit: number): QueryBuilder;

package/dist/lib/QueryBuilder.js

@@ -33,6 +33,10 @@ export class QueryBuilder {
         this.options.where = { $or: [currentWhere, newCondition] };
         return this;
     }
+    select(fields) {
+        this.options.select = fields;
+        return this;
+    }
     sort(field, direction = 'asc') {
         this.options.sort = field;
         this.options.sortType = direction;
@@ -69,6 +73,12 @@ export class QueryBuilder {
             params.q = this.options.q;
         if (this.options.searchKeys)
             params.searchKeys = this.options.searchKeys;
+        const sel = this.options.select ?? this.options.fields;
+        if (sel) {
+            const strSel = Array.isArray(sel) ? sel.join(',') : String(sel);
+            if (strSel.trim())
+                params.select = strSel.trim();
+        }
         return params;
     }
 }

package/dist/lib/api.d.ts

@@ -9,6 +9,7 @@ export declare class ApiError extends Error {
 export declare class NextMinClient {
     private baseURL;
     private apiKey;
+    private static inFlightRequests;
     constructor(options?: {
         baseURL?: string;
         apiKey?: string;
@@ -30,6 +31,11 @@ export type ListParams = {
     dateFrom?: string;
     dateTo?: string;
     dateKey?: string;
+    sort?: string;
+    sortType?: string;
+    where?: Record<string, any>;
+    select?: string | string[];
+    fields?: string | string[];
 };
 export declare const api: {
     getSchemas: () => Promise<unknown>;

package/dist/lib/api.js

@@ -25,39 +25,56 @@ export class NextMinClient {
             headers.Authorization = `Bearer ${bearer}`;
         const queryString = query ? qs(query) : '';
         const url = `${this.baseURL || normalizeBase(AuthClient.getBaseURL())}${path}${queryString}`;
-        let res;
-        try {
-            res = await fetch(url, {
-                method,
-                headers,
-                body: body && json && !isForm ? JSON.stringify(body) : body,
-            });
-        }
-        catch (networkErr) {
-            const err = new ApiError(networkErr?.message || 'Network error', 0);
-            err.request = { url, method, headers };
-            throw err;
-        }
-        const raw = await res.text();
-        let payload = {};
-        try {
-            payload = raw ? JSON.parse(raw) : {};
-        }
-        catch {
-            payload = raw || {};
+        if (method === 'GET') {
+            const pending = NextMinClient.inFlightRequests.get(url);
+            if (pending) {
+                return pending;
+            }
         }
-        if (!res.ok) {
-            throw payload;
+        const execRequest = (async () => {
+            let res;
+            try {
+                res = await fetch(url, {
+                    method,
+                    headers,
+                    body: body && json && !isForm ? JSON.stringify(body) : body,
+                });
+            }
+            catch (networkErr) {
+                const err = new ApiError(networkErr?.message || 'Network error', 0);
+                err.request = { url, method, headers };
+                throw err;
+            }
+            const raw = await res.text();
+            let payload = {};
+            try {
+                payload = raw ? JSON.parse(raw) : {};
+            }
+            catch {
+                payload = raw || {};
+            }
+            if (!res.ok) {
+                const msg = payload?.message || payload?.error || res.statusText || 'API error';
+                throw new ApiError(typeof msg === 'string' ? msg : 'API error', res.status, payload);
+            }
+            return payload;
+        })();
+        if (method === 'GET') {
+            NextMinClient.inFlightRequests.set(url, execRequest);
+            execRequest.finally(() => {
+                NextMinClient.inFlightRequests.delete(url);
+            });
         }
-        return payload;
+        return execRequest;
     }
 }
+NextMinClient.inFlightRequests = new Map();
 // Keep the global request for backward compatibility, but make it use AuthClient config
 async function request(path, opts = {}) {
     return new NextMinClient().request(path, opts);
 }
 function modelPath(modelName) {
-    return modelName.toLowerCase() === 'user' ? '/auth/user' : `/${modelName}`;
+    return `/${modelName}`;
 }
 function qs(params) {
     const sp = new URLSearchParams();
@@ -95,6 +112,10 @@ export const api = {
             builder.page(Math.max(1, options.page), options.limit);
         if (options.q)
             builder.search(options.q, options.searchKeys?.split(','));
+        if (options.select)
+            builder.select(options.select);
+        else if (options.fields)
+            builder.select(options.fields);
         const params = builder.build();
         return request(`${modelPath(modelName)}${qs(params)}`);
     },

package/dist/lib/schemaUtils.js

@@ -12,7 +12,7 @@ export function inputTypeFor(attr) {
         return 'number';
     if (a.type === 'boolean')
         return 'checkbox';
-    if (a.longtext)
+    if (a.longtext || a.format === 'textarea')
         return 'textarea';
     return 'text';
 }

package/dist/lib/types.d.ts

@@ -5,6 +5,7 @@ export type AttributeBase = {
     private?: boolean;
     ref?: string;
     longtext?: boolean;
+    format?: string;
     show?: string;
     populateSlugFrom?: string;
     minLength?: number;
@@ -17,7 +18,11 @@ export type ArrayAttribute = AttributeBase[];
 export type Attribute = AttributeBase | ArrayAttribute;
 export type CustomAction = {
     label: string;
-    href: string;
+    url?: string;
+    href?: string;
+    type?: string;
+    actionType?: string;
+    urlTemplate?: string;
     icon?: string;
     variant?: 'light' | 'flat' | 'solid' | 'bordered';
     color?: 'default' | 'primary' | 'secondary' | 'success' | 'warning' | 'danger';