rimecms 0.28.10 → 0.30.0

package/dist/panel/components/sections/document/Settings.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
   import { page } from '$app/state';
-  import { apiUrl } from '../../../../core/api/index.js';
   import { PARAMS, VERSIONS_STATUS } from '../../../../core/constant.js';
   import * as Dialog from '../../ui/dialog/index.js';
   import * as DropdownMenu from '../../ui/dropdown-menu/index.js';
@@ -10,6 +9,7 @@
   import { panelUrl } from '../../../util/url.js';
   import type { GenericDoc } from '../../../../types.js';
   import { trycatchFetch } from '../../../../util/function.js';
+  import { apiUrl } from '../../../../util/index.js';
   import { Copy, History, Import, Pickaxe, Settings, Trash2 } from '@lucide/svelte';
   import { toast } from 'svelte-sonner';
   import { t__ } from '../../../../core/i18n/index.js';

package/dist/panel/components/sections/live/LiveEditPanel.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { getFieldBuildersAtPath } from '../../../../core/fields/util.js';
+  import { getFieldListAtPath } from '../../../../core/fields/util.js';
   import RenderFields from '../../fields/RenderFields.svelte';
   import { getConfigContext } from '../../../context/config.svelte.js';
   import { setDocumentFormContext } from '../../../context/documentForm.svelte.js';
@@ -41,7 +41,7 @@
   onMount(() => onFormReady(form));
 
   // Reactive: re-derives when fieldPath changes (no remount needed)
-  const { fields, path } = $derived(getFieldBuildersAtPath(fieldPath, docConfig.fields));
+  const { fields, path } = $derived(getFieldListAtPath(fieldPath, docConfig.fields));
 </script>
 
 <form class="rz-live-edit-panel" use:form.enhance enctype="multipart/form-data" method="post">

package/dist/panel/context/collection.svelte.js

@@ -1,5 +1,4 @@
 import { invalidateAll } from '$app/navigation';
-import { apiUrl } from '../../core/api/index.js';
 import { isUploadConfig } from '../../core/collections/upload/util/config.js';
 import { PARAMS } from '../../core/constant.js';
 import { isFormField } from '../../core/fields/util.js';
@@ -9,6 +8,7 @@ import { TabsBuilder } from '../../fields/tabs/index.js';
 import { panelUrl } from '../util/url.js';
 import { toNestedStructure } from '../../util/doc.js';
 import { trycatch, trycatchFetch } from '../../util/function.js';
+import { apiUrl } from '../../util/index.js';
 import { getValueAtPath, hasProp } from '../../util/object.js';
 import { getContext, onMount, setContext } from 'svelte';
 import { toast } from 'svelte-sonner';
@@ -61,26 +61,26 @@ function createCollectionStore(args) {
         for (const field of fields) {
             if (field instanceof GroupFieldBuilder) {
                 // For group fields, pass the current group name as parent path for nested fields
-                const groupPath = parentPath ? `${parentPath}.${field.raw.name}` : field.raw.name;
-                columns = [...columns, ...buildFieldColumns(field.raw.fields, groupPath)];
+                const groupPath = parentPath ? `${parentPath}.${field.name}` : field.name;
+                columns = [...columns, ...buildFieldColumns(field.get.fields, groupPath)];
             }
-            if (isFormField(field.raw) && hasProp('table', field.raw)) {
+            if (isFormField(field) && hasProp('table', field.get)) {
                 // Create current field path
-                const path = parentPath ? `${parentPath}.${field.raw.name}` : field.raw.name;
+                const path = parentPath ? `${parentPath}.${field.name}` : field.name;
                 // Create column
                 const column = {
                     type: field.type,
                     path,
-                    cell: field.raw.table.cell || field.cell,
-                    table: field.raw.table
+                    cell: field.get.table.cell || field.cell,
+                    table: field.get.table
                 };
                 columns.push(column);
             }
             else if (field instanceof TabsBuilder) {
-                for (const tab of field.raw.tabs) {
+                for (const tab of field.get.tabs) {
                     // For tab fields, create a path with the tab name
-                    const path = parentPath ? `${parentPath}.${tab.raw.name}` : tab.raw.name;
-                    columns = [...columns, ...buildFieldColumns(tab.raw.fields, path)];
+                    const path = parentPath ? `${parentPath}.${tab.name}` : tab.name;
+                    columns = [...columns, ...buildFieldColumns(tab.get.fields, path)];
                 }
             }
         }

package/dist/panel/context/documentForm.svelte.d.ts

@@ -1,6 +1,7 @@
 import type { BuiltAreaClient, BuiltCollectionClient } from '../../core/config/types.js';
+import type { FormFieldBuilder } from '../../core/fields/builders/index.js';
 import type { AreaSlug, GenericBlock, GenericDoc, TreeBlock } from '../../core/types/doc.js';
-import type { FormField, SimplerField } from '../../fields/types.js';
+import type { FormField } from '../../types.js';
 import type { Dic, WithOptional } from '../../util/types.js';
 export declare function setDocumentFormContext<T extends WithOptional<GenericDoc, 'id'>>(args: Args<T>): {
     key: string;
@@ -9,7 +10,7 @@ export declare function setDocumentFormContext<T extends WithOptional<GenericDoc
     enhance: (node: HTMLFormElement) => {
         destroy(): void;
     };
-    useField: <TValue>(path: string, config?: SimplerField<FormField>) => {
+    useField: <TValue>(path: string, config?: FormFieldBuilder<FormField>) => {
         path: string;
         setValueFromDefaultLocale: () => Promise<void>;
         get value(): TValue | undefined;
@@ -46,12 +47,11 @@ export declare function setDocumentFormContext<T extends WithOptional<GenericDoc
     values: T & {
         _type: any;
         _prototype: any;
-        title: any;
     };
     readonly changes: Partial<GenericDoc>;
     readonly errors: {
         readonly length: number;
-        value: import("../types.js").FormErrors;
+        value: import("../../types.js").FormErrors;
         readonly first: string;
         has(key: string): boolean;
         hasRequired(key: string): boolean;
@@ -61,13 +61,7 @@ export declare function setDocumentFormContext<T extends WithOptional<GenericDoc
         deleteAllThatStartWith(path: string): void;
     };
     readonly config: BuiltCollectionClient;
-    readonly title: string | {
-        singular: string;
-        plural: string;
-        search?: string | undefined;
-        create?: string | undefined;
-        none?: string | undefined;
-    };
+    readonly title: string | import("../../core/config/types.js").CollectionLabel;
     readonly isLive: boolean;
     reset(): void;
     setFocusedField(path: string): void;
@@ -79,7 +73,7 @@ export declare function getDocumentFormContext<T extends WithOptional<GenericDoc
     enhance: (node: HTMLFormElement) => {
         destroy(): void;
     };
-    useField: <TValue>(path: string, config?: SimplerField<FormField>) => {
+    useField: <TValue>(path: string, config?: FormFieldBuilder<FormField>) => {
         path: string;
         setValueFromDefaultLocale: () => Promise<void>;
         get value(): TValue | undefined;
@@ -116,12 +110,11 @@ export declare function getDocumentFormContext<T extends WithOptional<GenericDoc
     values: T & {
         _type: any;
         _prototype: any;
-        title: any;
     };
     readonly changes: Partial<GenericDoc>;
     readonly errors: {
         readonly length: number;
-        value: import("../types.js").FormErrors;
+        value: import("../../types.js").FormErrors;
         readonly first: string;
         has(key: string): boolean;
         hasRequired(key: string): boolean;
@@ -131,13 +124,7 @@ export declare function getDocumentFormContext<T extends WithOptional<GenericDoc
         deleteAllThatStartWith(path: string): void;
     };
     readonly config: BuiltCollectionClient;
-    readonly title: string | {
-        singular: string;
-        plural: string;
-        search?: string | undefined;
-        create?: string | undefined;
-        none?: string | undefined;
-    };
+    readonly title: string | import("../../core/config/types.js").CollectionLabel;
     readonly isLive: boolean;
     reset(): void;
     setFocusedField(path: string): void;

package/dist/panel/context/documentForm.svelte.js

@@ -1,13 +1,11 @@
 import { applyAction, deserialize } from '$app/forms';
 import { page } from '$app/state';
-import { apiUrl } from '../../core/api/index.js';
-import { compileDocumentConfig } from '../../core/config/shared/compile.js';
 import { PARAMS, VERSIONS_STATUS } from '../../core/constant.js';
-import { getFieldConfigByPath } from '../../core/fields/util.js';
+import { getFieldAtPath } from '../../core/fields/util.js';
 import { buildConfigMap } from '../../core/operations/configMap/index.js';
 import { isJSONContent, richTextJSONToText } from '../../fields/rich-text/index.js';
 import { normalizeFieldPath } from '../../util/doc.js';
-import { random } from '../../util/index.js';
+import { apiUrl, random } from '../../util/index.js';
 import { isObjectLiteral, omit } from '../../util/object.js';
 import cloneDeep from 'clone-deep';
 import { diff } from 'deep-object-diff';
@@ -29,7 +27,7 @@ function createDocumentFormState({ initial, config, readOnly, key, onNestedDocum
     let initialDoc = $state(initial);
     let doc = $state(initial);
     let formElement = $state();
-    const documentConfig = compileDocumentConfig(config);
+    const documentConfig = config;
     const changes = $derived(diff(initialDoc, doc));
     let isDisabled = $state(readOnly);
     let processing = $state(false);
@@ -336,32 +334,43 @@ function createDocumentFormState({ initial, config, readOnly, key, onNestedDocum
         // Return primitive values as is
         return data;
     };
+    /**
+     * `config` is the raw compiled field data, same as every field component
+     * (Text.svelte, Group.svelte, ...) already works with — this mirrors
+     * `form.svelte.ts`'s `useField` on purpose, since both read plain field
+     * data (`.required`, `.isEmpty(value)`, `.validate(...)`, `.access.read`,
+     * `.condition(...)`), never builder methods. `config` is only omitted by
+     * callers with just a path in hand (e.g. `Group.svelte`'s `getField`), in
+     * which case it's resolved from `documentConfig.fields` and unwrapped via
+     * `.get` — the field must exist in the document's own field tree for that
+     * to work, which doesn't hold for standalone fields like the panel's
+     * password inputs (see AuthFooter.svelte), so those always pass `config`.
+     */
     function useField(path, config) {
         if (!config) {
-            config = getFieldConfigByPath(path, documentConfig.fields);
-            if (!config)
+            const resolved = getFieldAtPath(path, documentConfig.fields);
+            if (!resolved)
                 throw new Error(`can't find config for field : ${path}`);
+            config = resolved;
         }
         path = path ? normalizeFieldPath(path) : config.name;
         const parts = $derived(path.split('.'));
         const validate = (value) => {
-            if (config.required && config.isEmpty(value)) {
+            if (config.get.required && config.run.isEmpty(value)) {
                 errors.set(path, 'required::required_field');
                 return 'required';
             }
-            if (config.validate) {
-                const validated = config.validate(value, {
-                    data: doc,
-                    locale: locale.code,
-                    id: doc.id ?? undefined,
-                    operation: doc.id ? 'update' : 'create',
-                    user: user.attributes,
-                    config
-                });
-                if (validated !== true) {
-                    errors.set(path, validated);
-                    return false;
-                }
+            const validated = config.run.validate(value, {
+                data: doc,
+                locale: locale.code,
+                id: doc.id ?? undefined,
+                operation: doc.id ? 'update' : 'create',
+                user: user.attributes,
+                config: config.get
+            });
+            if (validated !== true) {
+                errors.set(path, validated);
+                return false;
             }
             if (errors.has(path)) {
                 errors.delete(path);
@@ -399,25 +408,20 @@ function createDocumentFormState({ initial, config, readOnly, key, onNestedDocum
                 setFieldValue(removeIds(defaultLocaleValue));
             }
         };
-        const setFieldValue = (value) => {
+        const setFieldValue = async (value) => {
+            value = await config.run.beforeValidate(value, { config, data: doc });
             const valid = validate(value);
-            if (!config.access?.update)
-                return;
-            if (operation === 'update' && !config.access.update(user.attributes)) {
+            if (operation === 'update' && !config.run.canUpdate(user.attributes)) {
                 return;
             }
             if (valid) {
                 setValue(path, value);
-                if (Array.isArray(config.hooks?.onChange)) {
-                    for (const hook of config.hooks?.onChange || []) {
-                        hook(value, {
-                            siblings: getSiblings(),
-                            useField,
-                            useBlocks,
-                            useTree
-                        });
-                    }
-                }
+                config.run.onChange?.(value, {
+                    siblings: getSiblings(),
+                    useField,
+                    useBlocks,
+                    useTree
+                });
             }
         };
         return {
@@ -432,35 +436,24 @@ function createDocumentFormState({ initial, config, readOnly, key, onNestedDocum
             get editable() {
                 if (readOnly)
                     return false;
-                if (!config.access)
-                    return false;
                 if (operation === 'create') {
-                    return config.access.create(user.attributes);
+                    return !!config.run.canCreate?.(user.attributes);
                 }
                 else {
-                    return config.access.update(user.attributes);
+                    return !!config.run.canUpdate?.(user.attributes);
                 }
             },
             get visible() {
-                if (config.access?.read && !config.access?.read(user.attributes)) {
+                if (!config.run.canRead(user.attributes)) {
                     return false;
                 }
-                let visible = true;
-                if (config.condition) {
-                    try {
-                        visible = config.condition(doc, getSiblings());
-                    }
-                    catch (err) {
-                        console.error(err.message);
-                    }
-                }
-                return visible;
+                return config.run.condition(doc, getSiblings());
             },
             get error() {
                 return errors.value[path] || false;
             },
             get isEmpty() {
-                return !!config.isEmpty && config.isEmpty(getValueAtPath(path, doc));
+                return config.run.isEmpty(getValueAtPath(path, doc));
             }
         };
     }
@@ -619,7 +612,7 @@ function createDocumentFormState({ initial, config, readOnly, key, onNestedDocum
             let data = { ...defaultLocaleDoc, locale: locale.code };
             const configMap = buildConfigMap(defaultLocaleDoc, documentConfig.fields);
             for (const [key, field] of Object.entries(configMap)) {
-                if (field.localized) {
+                if (field.get.localized) {
                     let value = getValueAtPath(key, data);
                     value = removeIds(value);
                     data = setValueAtPath(key, data, value);
@@ -694,8 +687,7 @@ export function setDocumentFormContext(args) {
     const initial = {
         ...args.initial,
         _type: args.initial._type || args.config.type,
-        _prototype: args.initial._prototype || args.config.slug,
-        title: args.initial.title || '[untitled]'
+        _prototype: args.initial._prototype || args.config.slug
     };
     const store = createDocumentFormState({ ...args, initial });
     return setContext(`${FORM_KEY}.${args.key}`, store);

package/dist/panel/context/form.svelte.d.ts

@@ -1,9 +1,10 @@
-import type { FormField, SimplerField } from '../../fields/types.js';
+import type { FormFieldBuilder } from '../../core/fields/builders/form-field-builder';
+import type { FormField } from '../../fields/types.js';
 import type { Dic } from '../../util/types.js';
 import type { SubmitFunction } from '@sveltejs/kit';
 export declare function setFormContext(initial: Dic, key: string): {
     setValue: (path: string, value: any) => void;
-    useField: (path: string | undefined, config: SimplerField<FormField>) => {
+    useField: (path: string | undefined, config: FormFieldBuilder<FormField>) => {
         path: string;
         value: any;
         readonly editable: boolean;
@@ -13,6 +14,7 @@ export declare function setFormContext(initial: Dic, key: string): {
     readOnly: boolean;
     enhance: SubmitFunction;
     getRawValue: <T>(path: string) => NonNullable<T> | null;
+    readonly pending: boolean;
     readonly canSubmit: boolean;
     readonly errors: {
         readonly length: number;
@@ -42,7 +44,7 @@ export declare function setFormContext(initial: Dic, key: string): {
 };
 export declare function getFormContext(key: string): {
     setValue: (path: string, value: any) => void;
-    useField: (path: string | undefined, config: SimplerField<FormField>) => {
+    useField: (path: string | undefined, config: FormFieldBuilder<FormField>) => {
         path: string;
         value: any;
         readonly editable: boolean;
@@ -52,6 +54,7 @@ export declare function getFormContext(key: string): {
     readOnly: boolean;
     enhance: SubmitFunction;
     getRawValue: <T>(path: string) => NonNullable<T> | null;
+    readonly pending: boolean;
     readonly canSubmit: boolean;
     readonly errors: {
         readonly length: number;

package/dist/panel/context/form.svelte.js

@@ -1,6 +1,6 @@
 import { applyAction } from '$app/forms';
-import { getValueAtPath } from '../../util/object';
-import { snapshot } from '../../util/state';
+import { getValueAtPath } from '../../util/object.js';
+import { snapshot } from '../../util/state.js';
 import { diff } from 'deep-object-diff';
 import { getContext, setContext } from 'svelte';
 import { setErrorsContext } from './errors.svelte';
@@ -12,6 +12,7 @@ function createFormStore(initial, key) {
     const hasError = $derived(errors.length);
     const canSubmit = $derived(Object.keys(changes).length > 0 && !hasError);
     let status = $state();
+    let pending = $state(false);
     $effect(() => {
         if (Object.keys(changes).length) {
             errors.value = {};
@@ -42,29 +43,27 @@ function createFormStore(initial, key) {
         const validate = (value) => {
             let isEmpty;
             try {
-                isEmpty = config.isEmpty(value);
+                isEmpty = config.run.isEmpty(value);
             }
             catch (err) {
                 console.error(err.message);
                 throw new Error(config.type + ' ' + err.message);
             }
-            if (config.required && isEmpty) {
+            if (config.get.required && isEmpty) {
                 errors.value[path] = 'required::required_field';
                 return false;
             }
-            if (config.validate) {
-                const validated = config.validate(value, {
-                    data: form,
-                    id: undefined,
-                    operation: undefined,
-                    user: undefined,
-                    locale: undefined,
-                    config
-                });
-                if (validated !== true) {
-                    errors.value[path] = validated;
-                    return false;
-                }
+            const validated = config.run.validate(value, {
+                data: form,
+                id: undefined,
+                operation: undefined,
+                user: undefined,
+                locale: undefined,
+                config: config.get
+            });
+            if (validated !== true) {
+                errors.value[path] = validated;
+                return false;
             }
             if (errors.has(path)) {
                 errors.delete(path);
@@ -86,7 +85,7 @@ function createFormStore(initial, key) {
                 }
             },
             get visible() {
-                return config.condition ? config.condition(form, {}) : true;
+                return config.run.condition(form, {});
             },
             get error() {
                 return errors.value[path] || false;
@@ -94,11 +93,13 @@ function createFormStore(initial, key) {
         };
     }
     const enhance = async ({ formData }) => {
+        pending = true;
         for (const key of Object.keys(form)) {
             formData.set(key, form[key]);
         }
         return async ({ result }) => {
             status = result.status;
+            pending = false;
             switch (result.type) {
                 case 'failure':
                     if (result.data?.errors) {
@@ -122,6 +123,9 @@ function createFormStore(initial, key) {
         readOnly: false,
         enhance,
         getRawValue,
+        get pending() {
+            return pending;
+        },
         get canSubmit() {
             return canSubmit;
         },

package/dist/panel/context/live.svelte.js

@@ -1,7 +1,7 @@
 import { page } from '$app/state';
 import { env } from '$env/dynamic/public';
-import { apiUrl } from '../../core/api/index.js';
 import { PARAMS } from '../../core/constant.js';
+import { apiUrl } from '../../util/index.js';
 import { toKebabCase } from '../../util/string.js';
 import { getContext, setContext } from 'svelte';
 import { getValueAtPath, isObjectLiteral, setValueAtPath } from '../../util/object.js';

package/dist/panel/index.d.ts

@@ -4,15 +4,21 @@ import type { Snippet } from 'svelte';
 import { Field } from './components/fields/index.js';
 import Panel from './components/Root.svelte';
 import Doc from './components/sections/document/Document.svelte';
+import Button from './components/ui/button/button.svelte';
+import Input from './components/ui/input/input.svelte';
+import SpinLoader from './components/ui/spin-loader/SpinLoader.svelte';
 import Area from './pages/area/Area.svelte';
 import AreaVersionsDoc from './pages/area/AreaVersionsDoc.svelte';
+import ForgotPassword from './pages/auth/forgot-password/ForgotPassword.svelte';
+import ResetPassword from './pages/auth/reset-password/ResetPassword.svelte';
+import SignIn from './pages/auth/sign-in/SignIn.svelte';
 import CollectionDoc from './pages/collection-document/CollectionDocument.svelte';
 import CollectionDocVersions from './pages/collection-document/CollectionDocVersions.svelte';
 import Collection from './pages/collection/Collection.svelte';
 import Dashboard from './pages/dashboard/Dashboard.svelte';
 import Live from './pages/live/Live.svelte';
 import type { Route } from './types.js';
-export { Area, AreaVersionsDoc, Collection, CollectionDoc, CollectionDocVersions, Dashboard, Doc, Field, Live, Panel };
+export { Area, AreaVersionsDoc, Button, Collection, CollectionDoc, CollectionDocVersions, Dashboard, Doc, Field, ForgotPassword, Input, Live, Panel, ResetPassword, SignIn, SpinLoader };
 export type { DocumentFormContext } from './context/documentForm.svelte.js';
 export type CollectionProps = {
     data: {
@@ -48,3 +54,5 @@ export type CollectionDocData<V extends boolean = boolean> = DocVersions<V> & Ba
 export type AreaDocData<V extends boolean = boolean> = DocVersions<V> & BaseDocData & {
     operation: 'update';
 };
+export type CollectionDocumentDataWithVersions = CollectionDocData<true>;
+export type AreaDataWithVersions = AreaDocData<true>;

package/dist/panel/index.js

@@ -1,8 +1,14 @@
 import { Field } from './components/fields/index.js';
 import Panel from './components/Root.svelte';
 import Doc from './components/sections/document/Document.svelte';
+import Button from './components/ui/button/button.svelte';
+import Input from './components/ui/input/input.svelte';
+import SpinLoader from './components/ui/spin-loader/SpinLoader.svelte';
 import Area from './pages/area/Area.svelte';
 import AreaVersionsDoc from './pages/area/AreaVersionsDoc.svelte';
+import ForgotPassword from './pages/auth/forgot-password/ForgotPassword.svelte';
+import ResetPassword from './pages/auth/reset-password/ResetPassword.svelte';
+import SignIn from './pages/auth/sign-in/SignIn.svelte';
 import CollectionDoc from './pages/collection-document/CollectionDocument.svelte';
 import CollectionDocVersions from './pages/collection-document/CollectionDocVersions.svelte';
 import Collection from './pages/collection/Collection.svelte';
@@ -10,4 +16,4 @@ import Dashboard from './pages/dashboard/Dashboard.svelte';
 import Live from './pages/live/Live.svelte';
 export { 
 // Components
-Area, AreaVersionsDoc, Collection, CollectionDoc, CollectionDocVersions, Dashboard, Doc, Field, Live, Panel };
+Area, AreaVersionsDoc, Button, Collection, CollectionDoc, CollectionDocVersions, Dashboard, Doc, Field, ForgotPassword, Input, Live, Panel, ResetPassword, SignIn, SpinLoader };

package/dist/panel/pages/area/actions.server.d.ts

@@ -1,21 +1,2 @@
-import type { AreaSlug } from '../../../core/types/doc.js';
-import { type RequestEvent } from '@sveltejs/kit';
-export default function (slug: AreaSlug): {
-    update: (event: RequestEvent) => Promise<import("@sveltejs/kit").ActionFailure<{
-        form: Record<string, any>;
-        errors: import("../../types.js").FormErrors;
-    }> | import("@sveltejs/kit").ActionFailure<{
-        form: Record<string, any>;
-        errors: {
-            email: string;
-        };
-    }> | import("@sveltejs/kit").ActionFailure<{
-        form: {};
-        errors: {
-            _form: string;
-        };
-    }> | {
-        document: unknown;
-        message: string;
-    }>;
-};
+import { type Actions } from '@sveltejs/kit';
+export declare const areaFormActions: Actions;

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

@@ -6,33 +6,34 @@ import { trycatch } from '../../../util/function.js';
 import { toKebabCase } from '../../../util/string.js';
 import { redirect } from '@sveltejs/kit';
 import { t__ } from '../../../core/i18n/index.js';
-export default function (slug) {
-    const actions = {
-        update: async (event) => {
-            const { rime, locale } = event.locals;
-            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);
-            const [error, document] = await trycatch(() => rime.area(slug).update({
-                data,
-                versionId,
-                draft,
-                locale
-            }));
-            if (error) {
-                return handleError(error, { context: ERROR_CONTEXT.ACTION });
+export const areaFormActions = {
+    update: async (event) => {
+        const { rime, locale } = event.locals;
+        const slug = (event.params.slug || '');
+        const versionId = event.url.searchParams.get(PARAMS.VERSION_ID) || undefined;
+        const draft = event.url.searchParams.get(PARAMS.DRAFT) === 'true';
+        const [extractError, data] = await trycatch(() => extractData(event.request));
+        if (extractError) {
+            return handleError(extractError, { context: ERROR_CONTEXT.ACTION });
+        }
+        const [error, document] = await trycatch(() => rime.area(slug).update({
+            data,
+            versionId,
+            draft,
+            locale
+        }));
+        if (error) {
+            return handleError(error, { context: ERROR_CONTEXT.ACTION });
+        }
+        if (draft && 'versionId' in document) {
+            const referer = event.request.headers.get('referer');
+            if (referer && referer.includes('/versions')) {
+                return redirect(303, `${panelUrl(toKebabCase(slug))}/versions?versionId=${document.versionId}`);
             }
-            if (draft && 'versionId' in document) {
-                const referer = event.request.headers.get('referer');
-                if (referer && referer.includes('/versions')) {
-                    return redirect(303, `${panelUrl(toKebabCase(slug))}/versions?versionId=${document.versionId}`);
-                }
-                else {
-                    return redirect(303, `${panelUrl(toKebabCase(slug))}?versionId=${document.versionId}`);
-                }
+            else {
+                return redirect(303, `${panelUrl(toKebabCase(slug))}?versionId=${document.versionId}`);
             }
-            return { document, message: t__('common.doc_updated') };
         }
-    };
-    return actions;
-}
+        return { document, message: t__('common.doc_updated') };
+    }
+};

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

@@ -1,18 +1,3 @@
-import type { AreaSlug } from '../../../core/types/doc.js';
-import type { Route } from '../../types.js';
+import type { AreaDocData } from '../../index.js';
 import type { ServerLoadEvent } from '@sveltejs/kit';
-export default function <V extends boolean = boolean>(slug: AreaSlug, withVersions?: V): ({ locals, url, fetch }: ServerLoadEvent) => Promise<({
-    aria: Partial<Route>[];
-    doc: import("../../../core/types/doc.js").GenericDoc;
-    status: 200;
-    readOnly: boolean;
-} & {
-    operation: "update";
-}) | ({
-    aria: Partial<Route>[];
-    doc: {};
-    status: 401;
-    readOnly: true;
-} & {
-    operation: "update";
-})>;
+export declare function areaLoad<V extends boolean = boolean>(event: ServerLoadEvent, withVersions?: V): Promise<AreaDocData<V>>;