rimecms 0.28.10 → 0.30.0

package/dist/panel/pages/area/load.server.js

@@ -1,55 +1,46 @@
-import { apiUrl } from '../../../core/api/index.js';
 import { PARAMS } from '../../../core/constant.js';
+import { ERROR_CONTEXT, handleError } from '../../../core/errors/handler.server.js';
 import { RimeError } from '../../../core/errors/index.js';
 import { withVersionsSuffix } from '../../../core/naming.js';
 import { panelUrl } from '../../util/url.js';
 import { trycatch } from '../../../util/function.js';
+import { apiUrl } from '../../../util/index.js';
 import { toKebabCase } from '../../../util/string.js';
-export default function (slug, withVersions) {
+export async function areaLoad(event, withVersions) {
     //
-    const load = async ({ locals, url, fetch }) => {
-        const { rime, locale } = locals;
-        const area = rime.area(slug);
-        const authorizedRead = area.config.access.read(locals.user, {});
-        const authorizedUpdate = area.config.access.update(locals.user, {});
-        const aria = [
-            { title: 'Dashboard', icon: 'dashboard', url: panelUrl() },
-            { title: area.config.label }
-        ];
-        if (!authorizedRead) {
-            return {
-                aria,
-                doc: {},
-                operation: 'update',
-                status: 401,
-                readOnly: true
-            };
-        }
-        const versionId = url.searchParams.get(PARAMS.VERSION_ID) || undefined;
-        const draft = url.searchParams.get(PARAMS.DRAFT)
-            ? url.searchParams.get(PARAMS.DRAFT) === 'true'
-            : undefined;
-        const doc = await area.find({ locale, versionId, draft });
-        if (!authorizedUpdate) {
-            return { aria, doc, operation: 'update', status: 200, readOnly: true };
-        }
-        let data = {
-            aria,
-            doc,
-            operation: 'update',
-            status: 200,
-            readOnly: false
-        };
-        if (withVersions) {
-            const url = `${apiUrl(withVersionsSuffix(toKebabCase(doc._type)))}?where[ownerId][equals]=${doc.id}&sort=-updatedAt&select=updatedAt,status`;
-            const promise = fetch(url).then((r) => r.json());
-            const [error, result] = await trycatch(promise);
-            if (error || !Array.isArray(result.docs)) {
-                throw new RimeError(RimeError.OPERATION_ERROR, 'while getting versions');
-            }
-            data = { ...data, versions: result.docs };
-        }
-        return data;
+    const { locals, url, fetch } = event;
+    const { rime, locale } = locals;
+    const slug = (event.params.slug || '');
+    const area = rime.area(slug);
+    const authorizedRead = area.config.access.read(locals.user, {});
+    const authorizedUpdate = area.config.access.update(locals.user, {});
+    if (!authorizedRead) {
+        throw handleError(new RimeError(RimeError.UNAUTHORIZED), { context: ERROR_CONTEXT.LOAD });
+    }
+    const aria = [
+        { title: 'Dashboard', icon: 'dashboard', url: panelUrl() },
+        { title: area.config.label }
+    ];
+    const versionId = url.searchParams.get(PARAMS.VERSION_ID) || undefined;
+    const draft = url.searchParams.get(PARAMS.DRAFT)
+        ? url.searchParams.get(PARAMS.DRAFT) === 'true'
+        : undefined;
+    const doc = await area.find({ locale, versionId, draft });
+    let data = {
+        aria,
+        doc,
+        operation: 'update',
+        status: 200,
+        readOnly: !authorizedUpdate
     };
-    return load;
+    if (withVersions) {
+        const url = `${apiUrl(withVersionsSuffix(toKebabCase(doc._type)))}?where[ownerId][equals]=${doc.id}&sort=-updatedAt&select=updatedAt,status`;
+        const promise = fetch(url).then((r) => r.json());
+        const [error, result] = await trycatch(promise);
+        if (error || !Array.isArray(result.docs)) {
+            throw new RimeError(RimeError.OPERATION_ERROR, 'while getting versions');
+        }
+        data = { ...data, versions: result.docs };
+    }
+    return data;
 }

package/dist/panel/pages/auth/fields.d.ts

@@ -1,4 +1,4 @@
-import type { EmailField, SimplerField, TextField } from '../../../fields/types.js';
-export declare const passwordField: SimplerField<TextField>;
-export declare const emailField: SimplerField<EmailField>;
-export declare const nameField: SimplerField<TextField>;
+export declare const passwordField: import("../../../fields/text/index.js").TextFieldBuilder;
+export declare const confirmPasswordField: import("../../../fields/text/index.js").TextFieldBuilder;
+export declare const emailField: import("../../../fields/email/index.js").EmailFieldBuilder;
+export declare const nameField: import("../../../fields/text/index.js").TextFieldBuilder;

package/dist/panel/pages/auth/fields.js

@@ -1,23 +1,7 @@
+import { email } from '../../../fields/email/index.js';
+import { text } from '../../../fields/text/index.js';
 import { email as validateEmail } from '../../../util/validate.js';
-export const passwordField = {
-    name: 'password',
-    type: 'text',
-    layout: 'compact',
-    required: true,
-    isEmpty: (value) => !value
-};
-export const emailField = {
-    name: 'email',
-    type: 'email',
-    layout: 'compact',
-    required: true,
-    validate: validateEmail,
-    isEmpty: (value) => !value
-};
-export const nameField = {
-    name: 'name',
-    type: 'text',
-    layout: 'compact',
-    required: true,
-    isEmpty: (value) => !value
-};
+export const passwordField = text('password').required();
+export const confirmPasswordField = text('confirmPassword').required();
+export const emailField = email('email').layout('compact').required().validate(validateEmail);
+export const nameField = text('name').layout('compact').required();

package/dist/panel/pages/auth/reset-password/ResetPassword.svelte

@@ -4,7 +4,7 @@
   import AuthForm from '../../../components/sections/auth/AuthForm.svelte';
   import Button from '../../../components/ui/button/button.svelte';
   import { setFormContext } from '../../../context/form.svelte';
-  import { passwordField } from '../fields.js';
+  import { confirmPasswordField, passwordField } from '../fields.js';
   import { authClient } from '../../../util/auth';
   import { toast } from 'svelte-sonner';
 
@@ -19,15 +19,8 @@
   };
   const { data }: Props = $props();
 
-  const passwordConfig = {
-    ...passwordField,
-    placeholder: t__('common.newPassword')
-  };
-  const confirmPasswordConfig = {
-    ...passwordField,
-    name: 'confirmPassword',
-    placeholder: t__('common.confirmPassword')
-  };
+  const passwordConfig = passwordField.placeholder(t__('common.newPassword'));
+  const confirmPasswordConfig = confirmPasswordField.placeholder(t__('common.confirmPassword'));
 
   async function resetPassword() {
     const token = new URLSearchParams(window.location.search).get('token');

package/dist/panel/pages/auth/sign-in/SignIn.svelte

@@ -5,6 +5,7 @@
   import Text from '../../../../fields/text/component/Text.svelte';
   import AuthForm from '../../../components/sections/auth/AuthForm.svelte';
   import Button from '../../../components/ui/button/button.svelte';
+  import SpinLoader from '../../../components/ui/spin-loader/SpinLoader.svelte';
   import { setFormContext } from '../../../context/form.svelte';
   import { emailField, passwordField } from '../fields.js';
   import type { FormErrors } from '../../../../types.js';
@@ -36,7 +37,12 @@
     <form method="POST" action="/panel/sign-in" use:enhance={context.enhance}>
       <Email config={emailField} form={context} />
       <Text type="password" icon={KeyRound} config={passwordField} form={context} />
-      <Button size="xl" disabled={!context.canSubmit} type="submit">Login</Button>
+      <Button size="xl" disabled={!context.canSubmit} type="submit">
+        {t__('common.signin')}
+        {#if context.pending}
+          <SpinLoader />
+        {/if}
+      </Button>
 
       {#if data.forgotPasswordEnabled}
         <Button variant="link" href="/forgot-password">

package/dist/panel/pages/collection/load.server.d.ts

@@ -1,8 +1,8 @@
+import type { Directory } from '../../../core/collections/upload/upload.js';
+import { type UploadPath } from '../../../core/collections/upload/util/path.js';
 import type { GenericDoc } from '../../../core/types/doc.js';
 import type { Route } from '../../types.js';
 import { type ServerLoadEvent } from '@sveltejs/kit';
-import type { Directory } from '../../../core/collections/upload/upload.js';
-import { type UploadPath } from '../../../core/collections/upload/util/path.js';
 type Data = {
     aria: Partial<Route>[];
     docs: GenericDoc[];
@@ -14,8 +14,8 @@ type Data = {
         parentDirectory: Directory;
     };
 };
-/****************************************************
-/* Layout load
-/****************************************************/
-export declare function collectionLoad(slug: string): (event: ServerLoadEvent) => Promise<Data>;
+/**
+ * Load function for the collection page in the panel.
+ */
+export declare function collectionLoad(event: ServerLoadEvent): Promise<Data>;
 export {};

package/dist/panel/pages/collection/load.server.js

@@ -1,85 +1,83 @@
-import { UPLOAD_PATH } from '../../../core/constant.js';
-import { withDirectoriesSuffix } from '../../../core/naming.js';
-import { redirect } from '@sveltejs/kit';
 import { buildUploadAria, getParentPath, removePathFromLastAria } from '../../../core/collections/upload/util/path.js';
-import { RimeError } from '../../../core/errors/index.js';
+import { UPLOAD_PATH } from '../../../core/constant.js';
 import { handleError } from '../../../core/errors/handler.server.js';
+import { RimeError } from '../../../core/errors/index.js';
 import { logger } from '../../../core/logger/index.server.js';
+import { withDirectoriesSuffix } from '../../../core/naming.js';
 import { panelUrl } from '../../util/url.js';
 import { trycatch } from '../../../util/function.js';
-/****************************************************
-/* Layout load
-/****************************************************/
-export function collectionLoad(slug) {
+import { redirect } from '@sveltejs/kit';
+/**
+ * Load function for the collection page in the panel.
+ */
+export async function collectionLoad(event) {
     //
-    const load = async (event) => {
-        const { rime, locale, user } = event.locals;
-        if (!rime.config.isCollection(slug)) {
-            throw handleError(new RimeError(RimeError.NOT_FOUND), { context: 'load' });
+    const { rime, locale, user } = event.locals;
+    const slug = event.params.slug || '';
+    if (!rime.config.isCollection(slug)) {
+        throw handleError(new RimeError(RimeError.NOT_FOUND), { context: 'load' });
+    }
+    const collection = rime.collection(slug);
+    const authorizedCreate = collection.config.access.create(user, {});
+    const docs = await collection.find({
+        locale,
+        draft: true
+    });
+    let aria = [
+        { title: 'Dashboard', url: panelUrl() },
+        { title: collection.config.label.plural }
+    ];
+    let data = {
+        aria,
+        docs,
+        canCreate: authorizedCreate,
+        status: 200
+    };
+    if (collection.config.upload) {
+        let directories = [];
+        const paramUploadPath = event.url.searchParams.get('uploadPath');
+        const currentDirectoryPath = paramUploadPath || UPLOAD_PATH.ROOT_NAME;
+        const directoryCollection = rime.collection(withDirectoriesSuffix(slug));
+        // Check if dir exists
+        const [error, currentDirectory] = await trycatch(() => directoryCollection.findById({
+            id: currentDirectoryPath
+        }));
+        // If doesn't exists and path is root then create it
+        if (!currentDirectory && currentDirectoryPath === UPLOAD_PATH.ROOT_NAME) {
+            await directoryCollection.create({
+                data: { id: UPLOAD_PATH.ROOT_NAME }
+            });
+        }
+        else if (error) {
+            logger.error(`${paramUploadPath} doesn't exists`);
+            return redirect(301, event.url.pathname);
         }
-        const collection = rime.collection(slug);
-        const authorizedCreate = collection.config.access.create(user, {});
-        const docs = await collection.find({
-            locale,
-            draft: true
+        directories = await directoryCollection.find({
+            query: `where[parent][equals]=${currentDirectoryPath}`,
+            sort: 'name'
         });
-        let aria = [
-            { title: 'Dashboard', url: panelUrl() },
-            { title: collection.config.label.plural }
-        ];
-        let data = {
-            aria,
-            docs,
-            canCreate: authorizedCreate,
-            status: 200
-        };
-        if (collection.config.upload) {
-            let directories = [];
-            const paramUploadPath = event.url.searchParams.get('uploadPath');
-            const currentDirectoryPath = paramUploadPath || UPLOAD_PATH.ROOT_NAME;
-            const directoryCollection = rime.collection(withDirectoriesSuffix(slug));
-            // Check if dir exists
-            const [error, currentDirectory] = await trycatch(() => directoryCollection.findById({
-                id: currentDirectoryPath
+        const parentPath = getParentPath(currentDirectoryPath);
+        let parentDirectory;
+        if (parentPath) {
+            const [parentError, result] = await trycatch(() => directoryCollection.findById({
+                id: parentPath
             }));
-            // If doesn't exists and path is root then create it
-            if (!currentDirectory && currentDirectoryPath === UPLOAD_PATH.ROOT_NAME) {
-                await directoryCollection.create({
-                    data: { id: UPLOAD_PATH.ROOT_NAME }
-                });
-            }
-            else if (error) {
-                logger.error(`${paramUploadPath} doesn't exists`);
-                return redirect(301, event.url.pathname);
+            if (parentError) {
+                throw handleError(parentError, { context: 'load' });
             }
-            directories = await directoryCollection.find({
-                query: `where[parent][equals]=${currentDirectoryPath}`,
-                sort: 'name'
-            });
-            const parentPath = getParentPath(currentDirectoryPath);
-            let parentDirectory;
-            if (parentPath) {
-                const [parentError, result] = await trycatch(() => directoryCollection.findById({
-                    id: parentPath
-                }));
-                if (parentError) {
-                    throw handleError(parentError, { context: 'load' });
-                }
-                parentDirectory = result;
-                const collectionAria = {
-                    title: collection.config.label.plural,
-                    url: panelUrl(collection.config.kebab)
-                };
-                aria = [...aria].slice(0, -1);
-                aria = [...aria, collectionAria, ...buildUploadAria({ path: currentDirectoryPath, slug })];
-                data.aria = removePathFromLastAria(aria);
-            }
-            data = {
-                ...data,
-                upload: { directories, currentPath: currentDirectoryPath, parentDirectory }
+            parentDirectory = result;
+            const collectionAria = {
+                title: collection.config.label.plural,
+                url: panelUrl(collection.config.kebab)
             };
+            aria = [...aria].slice(0, -1);
+            aria = [...aria, collectionAria, ...buildUploadAria({ path: currentDirectoryPath, slug })];
+            data.aria = removePathFromLastAria(aria);
         }
-        return data;
-    };
-    return load;
+        data = {
+            ...data,
+            upload: { directories, currentPath: currentDirectoryPath, parentDirectory }
+        };
+    }
+    return data;
 }

package/dist/panel/pages/collection-document/actions.server.d.ts

@@ -1,2 +1,2 @@
 import { type Actions } from '@sveltejs/kit';
-export default function (slug: string): Actions;
+export declare const collectionFormActions: Actions;

package/dist/panel/pages/collection-document/actions.server.js

@@ -1,5 +1,5 @@
 import { PARAMS, UPLOAD_PATH } from '../../../core/constant.js';
-import { handleError } from '../../../core/errors/handler.server.js';
+import { ERROR_CONTEXT, handleError } from '../../../core/errors/handler.server.js';
 import { RimeError } from '../../../core/errors/index.js';
 import { extractData } from '../../../core/operations/extract-data.server.js';
 import { panelUrl } from '../../util/url.js';
@@ -7,80 +7,88 @@ import { trycatch } from '../../../util/function.js';
 import { toKebabCase } from '../../../util/string.js';
 import {} from '@sveltejs/kit';
 import { t__ } from '../../../core/i18n/index.js';
-export default function (slug) {
-    const actions = {
-        /**
-         * Create a document.
-         * Action called when posting a form from the panel :
-         * /panel/{slug}/create
-         */
-        create: async (event) => {
-            const { rime, locale } = event.locals;
-            // Get the redirect parameter ex: ?redirect=0 that can be present if we're in a nested form
-            // to prevent redirection after entry creation ex: for relation creation
-            const withoutRedirect = event.url.searchParams.get(PARAMS.REDIRECT) === 'false';
-            const data = await extractData(event.request);
-            if (!rime.config.isCollection(slug)) {
-                throw handleError(new RimeError(RimeError.NOT_FOUND), { context: 'action' });
-            }
-            const collection = rime.collection(slug);
-            const [error, document] = await trycatch(() => collection.create({ data, locale }));
-            if (error) {
-                return handleError(error, { context: 'action' });
-            }
-            if (withoutRedirect) {
-                return {
-                    document,
-                    message: t__('common.doc_created')
-                };
-            }
-            // Redirect to proper upload directory if collection.upload
-            const params = collection.config.upload
-                ? `?${PARAMS.UPLOAD_PATH}=${data._path || UPLOAD_PATH.ROOT_NAME}`
-                : '';
-            const redirectUrl = `${panelUrl(toKebabCase(slug), document.id)}${params}`;
+export const collectionFormActions = {
+    /**
+     * Create a document.
+     * Action called when posting a form from the panel :
+     * /panel/{slug}/create
+     */
+    create: async (event) => {
+        const { rime, locale } = event.locals;
+        const slug = event.params.slug;
+        if (!rime.config.isCollection(slug)) {
+            throw handleError(new RimeError(RimeError.NOT_FOUND), { context: ERROR_CONTEXT.ACTION });
+        }
+        // Get the redirect parameter ex: ?redirect=false that can be present if we're in a nested form
+        // to prevent redirection after entry creation ex: for relation creation
+        const withoutRedirect = event.url.searchParams.get(PARAMS.REDIRECT) === 'false';
+        const [extractError, data] = await trycatch(() => extractData(event.request));
+        if (extractError) {
+            return handleError(extractError, { context: ERROR_CONTEXT.ACTION });
+        }
+        if (!rime.config.isCollection(slug)) {
+            throw handleError(new RimeError(RimeError.NOT_FOUND), { context: ERROR_CONTEXT.ACTION });
+        }
+        const collection = rime.collection(slug);
+        const [error, document] = await trycatch(() => collection.create({ data, locale }));
+        if (error) {
+            return handleError(error, { context: ERROR_CONTEXT.ACTION });
+        }
+        if (withoutRedirect) {
             return {
-                redirectUrl,
                 document,
                 message: t__('common.doc_created')
             };
-        },
-        /**
-         * Update a document.
-         * Action called when posting a form from the panel :
-         * /panel/{slug}/{documentId}
-         */
-        update: async (event) => {
-            const { rime, locale } = event.locals;
-            const id = event.params.id || '';
-            const versionId = event.url.searchParams.get(PARAMS.VERSION_ID) || undefined;
-            const draft = event.url.searchParams.get(PARAMS.DRAFT) === 'true';
-            const data = await extractData(event.request);
-            if (!rime.config.isCollection(slug)) {
-                throw handleError(new RimeError(RimeError.NOT_FOUND), { context: 'action' });
-            }
-            const [error, document] = await trycatch(() => rime.collection(slug).updateById({
-                id,
-                data,
-                versionId,
-                draft,
-                locale
-            }));
-            if (error) {
-                return handleError(error, { context: 'action' });
-            }
-            if (draft && 'versionId' in document) {
-                return {
-                    document,
-                    message: t__('common.version_created'),
-                    redirectUrl: `${panelUrl(toKebabCase(slug), document.id)}/versions?versionId=${document.versionId}`
-                };
-            }
+        }
+        // Redirect to proper upload directory if collection.upload
+        const params = collection.config.upload
+            ? `?${PARAMS.UPLOAD_PATH}=${data._path || UPLOAD_PATH.ROOT_NAME}`
+            : '';
+        const redirectUrl = `${panelUrl(toKebabCase(slug), document.id)}${params}`;
+        return {
+            redirectUrl,
+            document,
+            message: t__('common.doc_created')
+        };
+    },
+    /**
+     * Update a document.
+     * Action called when posting a form from the panel :
+     * /panel/{slug}/{documentId}
+     */
+    update: async (event) => {
+        const { rime, locale } = event.locals;
+        const slug = event.params.slug || '';
+        const id = event.params.id || '';
+        const versionId = event.url.searchParams.get(PARAMS.VERSION_ID) || undefined;
+        const draft = event.url.searchParams.get(PARAMS.DRAFT) === 'true';
+        if (!rime.config.isCollection(slug)) {
+            throw handleError(new RimeError(RimeError.NOT_FOUND), { context: ERROR_CONTEXT.ACTION });
+        }
+        const [extractError, data] = await trycatch(() => extractData(event.request));
+        if (extractError) {
+            return handleError(extractError, { context: ERROR_CONTEXT.ACTION });
+        }
+        const [error, document] = await trycatch(() => rime.collection(slug).updateById({
+            id,
+            data,
+            versionId,
+            draft,
+            locale
+        }));
+        if (error) {
+            return handleError(error, { context: ERROR_CONTEXT.ACTION });
+        }
+        if (draft && 'versionId' in document) {
             return {
                 document,
-                message: t__('common.doc_updated')
+                message: t__('common.version_created'),
+                redirectUrl: `${panelUrl(toKebabCase(slug), document.id)}/versions?versionId=${document.versionId}`
             };
         }
-    };
-    return actions;
-}
+        return {
+            document,
+            message: t__('common.doc_updated')
+        };
+    }
+};

package/dist/panel/pages/collection-document/load.server.d.ts

@@ -1,21 +1,6 @@
-import type { GenericDoc } from '../../../core/types/doc.js';
-import type { Route } from '../../types.js';
+import type { CollectionDocData } from '../../index.js';
 import { type ServerLoadEvent } from '@sveltejs/kit';
-/****************************************************/
-export declare function docLoad(slug: string, withVersion?: boolean): <V extends boolean = boolean>(event: ServerLoadEvent) => Promise<({
-    aria: Partial<Route>[];
-    doc: GenericDoc;
-    status: 200;
-    readOnly: boolean;
-} & {
-    operation: "create" | "update";
-    hasMailer?: boolean;
-}) | ({
-    aria: Partial<Route>[];
-    doc: {};
-    status: 401;
-    readOnly: true;
-} & {
-    operation: "create" | "update";
-    hasMailer?: boolean;
-})>;
+/**
+ * Load function for the collection document page in the panel.
+ */
+export declare function documentLoad<V extends boolean = boolean>(event: ServerLoadEvent, withVersion?: V): Promise<CollectionDocData<V>>;