rimecms 0.28.10 → 0.30.0

package/dist/core/collections/{api → rest}/deleteById.server.d.ts

@@ -1,6 +1,8 @@
-import type { CollectionSlug } from '../../types/doc.js';
 import { type RequestEvent } from '@sveltejs/kit';
-export default function (slug: CollectionSlug): (event: RequestEvent) => Promise<Response | import("@sveltejs/kit").ActionFailure<{
+/**
+ * DELETE handler for the collection API endpoint to delete a document by its ID.
+ */
+export declare function restDeleteById(event: RequestEvent): Promise<Response | import("@sveltejs/kit").ActionFailure<{
     form: Record<string, any>;
     errors: import("../../../types").FormErrors;
 }> | import("@sveltejs/kit").ActionFailure<{

package/dist/core/collections/rest/deleteById.server.js

@@ -0,0 +1,21 @@
+import { RimeError } from '../../errors/index.js';
+import { handleError } from '../../errors/handler.server.js';
+import { trycatch } from '../../../util/function.js';
+import { json } from '@sveltejs/kit';
+/**
+ * DELETE handler for the collection API endpoint to delete a document by its ID.
+ */
+export async function restDeleteById(event) {
+    //
+    const { rime } = event.locals;
+    const slug = event.params.slug;
+    if (!rime.config.isCollection(slug)) {
+        return handleError(new RimeError(RimeError.NOT_FOUND), { context: 'api' });
+    }
+    const id = event.params.id || '';
+    const [error] = await trycatch(() => rime.collection(slug).deleteById({ id }));
+    if (error) {
+        return handleError(error, { context: 'api' });
+    }
+    return json({ id });
+}

package/dist/core/collections/{api → rest}/duplicate.server.d.ts

@@ -1,5 +1,5 @@
 import { type RequestEvent } from '@sveltejs/kit';
-export default function (slug: string): (event: RequestEvent) => Promise<Response | import("@sveltejs/kit").ActionFailure<{
+export declare function restDuplicate(event: RequestEvent): Promise<Response | import("@sveltejs/kit").ActionFailure<{
     form: Record<string, any>;
     errors: import("../../../types").FormErrors;
 }> | import("@sveltejs/kit").ActionFailure<{

package/dist/core/collections/rest/duplicate.server.js

@@ -0,0 +1,20 @@
+import { ERROR_CONTEXT, handleError } from '../../errors/handler.server.js';
+import { RimeError } from '../../errors/index.js';
+import { trycatch } from '../../../util/function.js';
+import { error, json } from '@sveltejs/kit';
+export async function restDuplicate(event) {
+    //
+    const { rime } = event.locals;
+    const slug = event.params.slug;
+    if (!rime.config.isCollection(slug)) {
+        return handleError(new RimeError(RimeError.NOT_FOUND), { context: ERROR_CONTEXT.API });
+    }
+    const collection = rime.collection(slug);
+    if (!event.params.id)
+        throw error(404);
+    const [duplicateError, newId] = await trycatch(() => collection.duplicate({ id: event.params.id }));
+    if (duplicateError) {
+        return handleError(duplicateError, { context: ERROR_CONTEXT.API });
+    }
+    return json({ id: newId });
+}

package/dist/core/collections/{api → rest}/get.server.d.ts

@@ -1,6 +1,8 @@
-import type { CollectionSlug } from '../../types/doc.js';
 import { type RequestEvent } from '@sveltejs/kit';
-export default function (slug: CollectionSlug): (event: RequestEvent) => Promise<Response | import("@sveltejs/kit").ActionFailure<{
+/**
+ * GET handler for the collection API endpoint.
+ */
+export declare function restGet(event: RequestEvent): Promise<Response | import("@sveltejs/kit").ActionFailure<{
     form: Record<string, any>;
     errors: import("../../../types").FormErrors;
 }> | import("@sveltejs/kit").ActionFailure<{

package/dist/core/collections/rest/get.server.js

@@ -0,0 +1,50 @@
+import { normalizeQuery } from '../../../adapter-sqlite/util.server.js';
+import { PARAMS } from '../../constant.js';
+import { RimeError } from '../../errors/index.js';
+import { handleError } from '../../errors/handler.server.js';
+import { trycatch } from '../../../util/function.js';
+import { json } from '@sveltejs/kit';
+/**
+ * GET handler for the collection API endpoint.
+ */
+export async function restGet(event) {
+    //
+    const { rime } = event.locals;
+    const slug = event.params.slug;
+    if (!rime.config.isCollection(slug)) {
+        return handleError(new RimeError(RimeError.NOT_FOUND), { context: 'api' });
+    }
+    const params = event.url.searchParams;
+    const hasQueryParams = !!params
+        .keys()
+        .filter((key) => key.startsWith('where'))
+        .toArray().length;
+    const collectionAPI = rime.collection(slug);
+    function buildSelect(params) {
+        const paramSelect = params.get(PARAMS.SELECT)
+            ? params.get(PARAMS.SELECT).split(',')
+            : undefined;
+        if (paramSelect &&
+            paramSelect.includes('title') &&
+            !paramSelect.includes(collectionAPI.config.asTitle)) {
+            paramSelect.push(collectionAPI.config.asTitle);
+        }
+        return paramSelect;
+    }
+    const query = hasQueryParams ? normalizeQuery(event.url.search.substring(1)) : undefined;
+    const apiParams = {
+        locale: rime.getLocale(),
+        sort: params.get(PARAMS.SORT) || undefined,
+        depth: params.get(PARAMS.DEPTH) ? parseInt(params.get(PARAMS.DEPTH)) : 0,
+        limit: params.get(PARAMS.LIMIT) ? parseInt(params.get(PARAMS.LIMIT)) : undefined,
+        offset: params.get(PARAMS.OFFSET) ? parseInt(params.get(PARAMS.OFFSET)) : undefined,
+        draft: params.get(PARAMS.DRAFT) ? params.get(PARAMS.DRAFT) === 'true' : undefined,
+        query,
+        select: buildSelect(params)
+    };
+    const [error, docs] = await trycatch(() => collectionAPI.find(apiParams));
+    if (error) {
+        return handleError(error, { context: 'api' });
+    }
+    return json({ docs }, { status: 200 });
+}

package/dist/core/collections/{api → rest}/getById.server.d.ts

@@ -1,6 +1,8 @@
-import type { CollectionSlug } from '../../types/doc.js';
 import { type RequestEvent } from '@sveltejs/kit';
-export default function (slug: CollectionSlug): (event: RequestEvent) => Promise<Response | import("@sveltejs/kit").ActionFailure<{
+/**
+ * GET handler for the collection API endpoint to retrieve a document by its ID.
+ */
+export declare function restGetById(event: RequestEvent): Promise<Response | import("@sveltejs/kit").ActionFailure<{
     form: Record<string, any>;
     errors: import("../../../types").FormErrors;
 }> | import("@sveltejs/kit").ActionFailure<{

package/dist/core/collections/rest/getById.server.js

@@ -0,0 +1,35 @@
+import { PARAMS } from '../../constant.js';
+import { RimeError } from '../../errors/index.js';
+import { handleError } from '../../errors/handler.server.js';
+import { trycatch } from '../../../util/function.js';
+import { json } from '@sveltejs/kit';
+/**
+ * GET handler for the collection API endpoint to retrieve a document by its ID.
+ */
+export async function restGetById(event) {
+    //
+    const { rime } = event.locals;
+    const slug = event.params.slug;
+    const id = event.params.id;
+    if (!rime.config.isCollection(slug) || !id) {
+        return handleError(new RimeError(RimeError.NOT_FOUND), { context: 'api' });
+    }
+    const paramDepth = event.url.searchParams.get(PARAMS.DEPTH);
+    const paramDraft = event.url.searchParams.get(PARAMS.DRAFT);
+    const versionId = event.url.searchParams.get(PARAMS.VERSION_ID) || undefined;
+    const draft = paramDraft ? paramDraft === 'true' : undefined;
+    const depth = typeof paramDepth === 'string' ? parseInt(paramDepth) : 0;
+    const select = event.url.searchParams.get(PARAMS.SELECT)?.split(',') || undefined;
+    const [error, document] = await trycatch(() => rime.collection(slug).findById({
+        id,
+        locale: rime.getLocale(),
+        depth,
+        draft,
+        versionId,
+        select
+    }));
+    if (error) {
+        return handleError(error, { context: 'api' });
+    }
+    return json({ doc: document });
+}

package/dist/core/collections/rest/index.server.d.ts

@@ -0,0 +1,16 @@
+import { restCreate } from './create.server.js';
+import { restDelete } from './delete.server.js';
+import { restDeleteById } from './deleteById.server.js';
+import { restDuplicate } from './duplicate.server.js';
+import { restGet } from './get.server.js';
+import { restGetById } from './getById.server.js';
+import { restUpdateById } from './updateById.server.js';
+export declare const rest: {
+    get: typeof restGet;
+    getById: typeof restGetById;
+    deleteById: typeof restDeleteById;
+    delete: typeof restDelete;
+    create: typeof restCreate;
+    updateById: typeof restUpdateById;
+    duplicate: typeof restDuplicate;
+};

package/dist/core/collections/rest/index.server.js

@@ -0,0 +1,16 @@
+import { restCreate } from './create.server.js';
+import { restDelete } from './delete.server.js';
+import { restDeleteById } from './deleteById.server.js';
+import { restDuplicate } from './duplicate.server.js';
+import { restGet } from './get.server.js';
+import { restGetById } from './getById.server.js';
+import { restUpdateById } from './updateById.server.js';
+export const rest = {
+    get: restGet,
+    getById: restGetById,
+    deleteById: restDeleteById,
+    delete: restDelete,
+    create: restCreate,
+    updateById: restUpdateById,
+    duplicate: restDuplicate
+};

package/dist/core/collections/{api → rest}/updateById.server.d.ts

@@ -1,6 +1,8 @@
-import type { CollectionSlug } from '../../types/doc.js';
 import { type RequestEvent } from '@sveltejs/kit';
-export default function (slug: CollectionSlug): (event: RequestEvent) => Promise<Response | import("@sveltejs/kit").ActionFailure<{
+/**
+ * PATCH handler for the collection API endpoint to update a document by its ID.
+ */
+export declare function restUpdateById(event: RequestEvent): Promise<Response | import("@sveltejs/kit").ActionFailure<{
     form: Record<string, any>;
     errors: import("../../../types").FormErrors;
 }> | import("@sveltejs/kit").ActionFailure<{

package/dist/core/collections/rest/updateById.server.js

@@ -0,0 +1,44 @@
+import { PARAMS } from '../../constant.js';
+import { ERROR_CONTEXT, handleError } from '../../errors/handler.server.js';
+import { RimeError } from '../../errors/index.js';
+import { extractData } from '../../operations/extract-data.server.js';
+import { trycatch } from '../../../util/function.js';
+import { json } from '@sveltejs/kit';
+/**
+ * PATCH handler for the collection API endpoint to update a document by its ID.
+ */
+export async function restUpdateById(event) {
+    //
+    const { rime } = event.locals;
+    const slug = event.params.slug;
+    const id = event.params.id;
+    // Check if the slug corresponds to a valid collection and if the ID is provided
+    if (!rime.config.isCollection(slug) || !id) {
+        return handleError(new RimeError(RimeError.NOT_FOUND), { context: ERROR_CONTEXT.API });
+    }
+    // Extract query parameters for versioning and draft status
+    const versionId = event.url.searchParams.get(PARAMS.VERSION_ID) || undefined;
+    const draft = event.url.searchParams.get(PARAMS.DRAFT)
+        ? event.url.searchParams.get(PARAMS.DRAFT) === 'true'
+        : undefined;
+    // Extract data from the request body
+    const [extractError, data] = await trycatch(() => extractData(event.request));
+    if (extractError) {
+        return handleError(extractError, { context: ERROR_CONTEXT.API });
+    }
+    // Set the locale if provided in the data
+    if (data.locale) {
+        rime.setLocale(data.locale);
+    }
+    const [error, document] = await trycatch(() => rime.collection(slug).updateById({
+        id,
+        data,
+        locale: rime.getLocale(),
+        versionId,
+        draft
+    }));
+    if (error) {
+        return handleError(error, { context: ERROR_CONTEXT.API });
+    }
+    return json({ doc: document });
+}

package/dist/core/collections/upload/disk/delete.server.d.ts

@@ -2,7 +2,7 @@ import type { BuiltCollection, Config } from '../../../config/types.js';
 import type { RimeContext } from '../../../rime.server.js';
 import type { GenericDoc } from '../../../types/doc.js';
 import type { WithUpload } from '../util/config.js';
-export declare const cleanupStoredFiles: <C extends Config>(args: {
+export declare const cleanUpDocumentFile: <C extends Config>(args: {
     config: WithUpload<BuiltCollection>;
     rime: RimeContext<C>;
     id: string;

package/dist/core/collections/upload/disk/delete.server.js

@@ -1,11 +1,58 @@
 import { logger } from '../../../logger/index.server.js';
+import { hasVersionsSuffix, withVersionsSuffix } from '../../../naming.js';
 import { existsSync, unlink, unlinkSync } from 'fs';
 import path from 'path';
-export const cleanupStoredFiles = async (args) => {
+/**
+ * A given filename on disk can be shared by several document rows across
+ * unrelated upload collections — saveFile dedupes any byte-identical upload
+ * to a single file (see isSameFile). For a versioned collection the root
+ * table is just an id/hierarchy envelope — all actual content, including
+ * the published state, lives in its `_versions` table — so versioned
+ * collections are checked via that sibling, which holds the full history
+ * rather than just the one row a base-collection query would join in.
+ * `selfId` must already be in whichever id-space `selfSlug` resolves to
+ * (a `_versions` row's own id, not the envelope's `id` — see versionId in
+ * mergeRawDocumentWithVersion). Every configured locale is checked since a
+ * localized collection's query can otherwise miss rows in non-default
+ * locales, even though `filename` itself is never a localized field.
+ */
+const isFilenameStillReferenced = async (args) => {
+    const { rime, filename, selfSlug, selfId } = args;
+    const targetSlugs = Object.values(rime.config.collections)
+        .filter((c) => c?.upload && !hasVersionsSuffix(c.slug))
+        .map((c) => (c.versions ? withVersionsSuffix(c.slug) : c.slug));
+    const locales = rime.config.getLocalesCodes();
+    const localesToQuery = locales.length ? locales : [undefined];
+    for (const slug of targetSlugs) {
+        for (const locale of localesToQuery) {
+            const docs = await rime.collection(slug).find({
+                query: `where[filename][equals]=${filename}`,
+                draft: true,
+                locale,
+                limit: slug === selfSlug ? 2 : 1
+            });
+            const referenced = docs.some((doc) => slug !== selfSlug || doc.id !== selfId);
+            if (referenced)
+                return true;
+        }
+    }
+    return false;
+};
+export const cleanUpDocumentFile = async (args) => {
     //
     const { config, rime, id } = args;
     const doc = await rime.collection(config.slug).findById({ id, draft: true });
     try {
+        if (!doc.filename)
+            return doc;
+        const stillReferenced = await isFilenameStillReferenced({
+            rime,
+            filename: doc.filename,
+            selfSlug: config.versions ? withVersionsSuffix(config.slug) : config.slug,
+            selfId: doc.versionId ?? doc.id
+        });
+        if (stillReferenced)
+            return doc;
         const filePath = path.resolve(process.cwd(), `static/medias/${doc.filename}`);
         // Delete original
         unlinkSync(filePath);

package/dist/core/collections/upload/hooks/clean-up-files.server.js

@@ -1,4 +1,4 @@
-import { cleanupStoredFiles } from '../disk/delete.server.js';
+import { cleanUpDocumentFile } from '../disk/delete.server.js';
 import { Hooks } from '../../../operations/hooks/index.server.js';
 /**
  * Hook executed before deleting a document to clean up associated files from storage.
@@ -12,6 +12,6 @@ import { Hooks } from '../../../operations/hooks/index.server.js';
 export const cleanUpFiles = Hooks.beforeDelete(async (args) => {
     const config = args.config;
     const id = args.context.params.id || '';
-    await cleanupStoredFiles({ config, rime: args.event.locals.rime, id });
+    await cleanUpDocumentFile({ config, rime: args.event.locals.rime, id });
     return args;
 });

package/dist/core/collections/upload/hooks/convert-base64.server.d.ts

@@ -10,4 +10,4 @@
  * @param args Hook arguments containing the document to process
  * @returns Updated args object with converted file data
  */
-export declare const castBase64ToFile: import("../../../operations/hooks/index.server.js").Hook<"upload", "create" | "update", "before">;
+export declare const castBase64ToFile: import("../../../operations/hooks/index.server.js").Hook<"upload", "update" | "create", "before">;

package/dist/core/collections/upload/hooks/extract-path.server.d.ts

@@ -1,6 +1,6 @@
 /**
  * Hook executed before save/update operations on {uploadSlug}_directories collections
- * the function nomalize and validate path ({slug}_directories.id).
+ * the function normalize and validate path ({slug}_directories.id).
  * Then extract parent, name from the given path.
  */
-export declare const exctractPath: import("../../../operations/hooks/index.server.js").Hook<"directory", "create" | "update", "before">;
+export declare const exctractPath: import("../../../operations/hooks/index.server.js").Hook<"directory", "update" | "create", "before">;

package/dist/core/collections/upload/hooks/extract-path.server.js

@@ -4,7 +4,7 @@ import { trycatchSync } from '../../../../util/function.js';
 import { getSegments } from '../util/path.js';
 /**
  * Hook executed before save/update operations on {uploadSlug}_directories collections
- * the function nomalize and validate path ({slug}_directories.id).
+ * the function normalize and validate path ({slug}_directories.id).
  * Then extract parent, name from the given path.
  */
 export const exctractPath = Hooks.beforeUpsert(async (args) => {

package/dist/core/collections/upload/hooks/handle-path-creation.server.d.ts

@@ -3,4 +3,4 @@
  * the function get the document _path and check if it exists,
  * if it doesn't it create {upload_slug}_directories entries recursively
  */
-export declare const handlePathCreation: import("../../../operations/hooks/index.server.js").Hook<"upload", "create" | "update", "before">;
+export declare const handlePathCreation: import("../../../operations/hooks/index.server.js").Hook<"upload", "update" | "create", "before">;

package/dist/core/collections/upload/hooks/process-file-upload.server.d.ts

@@ -17,4 +17,4 @@
  *    - Cleans up image variations
  *    - Nullifies related document fields
  */
-export declare const processFileUpload: import("../../../operations/hooks/index.server.js").Hook<"upload", "create" | "update", "before">;
+export declare const processFileUpload: import("../../../operations/hooks/index.server.js").Hook<"upload", "update" | "create", "before">;

package/dist/core/collections/upload/hooks/process-file-upload.server.js

@@ -1,4 +1,4 @@
-import { cleanupStoredFiles } from '../disk/delete.server.js';
+import { cleanUpDocumentFile } from '../disk/delete.server.js';
 import { saveFile } from '../disk/save.server.js';
 import { Hooks } from '../../../operations/hooks/index.server.js';
 import { omit } from '../../../../util/object.js';
@@ -33,7 +33,7 @@ export const processFileUpload = Hooks.beforeUpsert(async (args) => {
     const sizesConfig = hasSizeConfig ? config.upload.imageSizes : [];
     if (data.file) {
         if (operation === 'update' && args.context.originalDoc) {
-            await cleanupStoredFiles({ config, rime, id: args.context.originalDoc.id });
+            await cleanUpDocumentFile({ config, rime, id: args.context.originalDoc.id });
         }
         const { filename, imageSizes } = await saveFile(data.file, sizesConfig);
         data = {
@@ -46,7 +46,7 @@ export const processFileUpload = Hooks.beforeUpsert(async (args) => {
     if (data.file === null) {
         // delete files
         if (operation === 'update' && args.context.originalDoc) {
-            await cleanupStoredFiles({ config, rime, id: args.context.originalDoc.id });
+            await cleanUpDocumentFile({ config, rime, id: args.context.originalDoc.id });
         }
         // update data for DB update
         for (const size of sizesConfig) {

package/dist/core/config/auth/better-auth.server.d.ts

@@ -1752,13 +1752,13 @@ export declare function getBaseAuthConfig<const C extends Config>(ctx: {
                     $Infer: {
                         body: ({
                             permission: {
-                                readonly user?: ("create" | "update" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
+                                readonly user?: ("update" | "create" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
                                 readonly session?: ("delete" | "list" | "revoke")[] | undefined;
                             };
                             permissions?: never | undefined;
                         } | {
                             permissions: {
-                                readonly user?: ("create" | "update" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
+                                readonly user?: ("update" | "create" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
                                 readonly session?: ("delete" | "list" | "revoke")[] | undefined;
                             };
                             permission?: never | undefined;

package/dist/core/config/client/augment-directories.js

@@ -1,5 +1,5 @@
 import { isUploadConfig } from '../../collections/upload/util/config.js';
-import { makeUploadDirectoriesCollectionClient } from '../shared/upload-directories';
+import { makeUploadDirectoriesCollectionClient } from '../shared/upload-directories.js';
 export const augmentDirectories = (config) => {
     const direcotriesCollections = config.collections
         ?.filter(isUploadConfig)

package/dist/core/config/config-context.server.d.ts

@@ -54,15 +54,15 @@ export declare function createConfigContext<const C extends Config>(config: Buil
     /**
      * Retrieves either an area or collection configuration by its slug
      */
-    getBySlug: (slug: string) => import("../../types.js").BuiltCollection | import("../../types.js").BuiltArea;
+    getBySlug: (slug: string) => import("../../types.js").BuiltArea | import("../../types.js").BuiltCollection;
     /**
      * Checks if a slug represents a collection
      */
-    isCollection: (slug: string) => slug is CollectionSlug;
+    isCollection: (slug?: string) => slug is CollectionSlug;
     /**
      * Checks if a slug represents an area
      */
-    isArea: (slug: string) => slug is AreaSlug;
+    isArea: (slug?: string) => slug is AreaSlug;
     /**
      * Determines the prototype (collection or area) of a document by its slug
      */

package/dist/core/config/server/augment-directories.server.js

@@ -2,7 +2,7 @@ import { augmentHooks } from '../../collections/config/augment-hooks.server.js';
 import { exctractPath } from '../../collections/upload/hooks/extract-path.server.js';
 import { prepareDirectoryChildren, updateDirectoryChildren } from '../../collections/upload/hooks/update-directory-children.server.js';
 import { isUploadConfig } from '../../collections/upload/util/config.js';
-import { makeUploadDirectoriesCollectionClient } from '../shared/upload-directories';
+import { makeUploadDirectoriesCollectionClient } from '../shared/upload-directories.js';
 export const augmentDirectoriesServer = (config) => {
     const direcotriesCollections = config.collections
         ?.filter(isUploadConfig)

package/dist/core/config/server/augment-panel-access.server.d.ts

@@ -6,7 +6,7 @@ export declare const augmentPanelAccess: <const T extends {
     readonly panel: {
         $access: (user?: User) => boolean;
         routes?: Record<string, import("../../../types.js").CustomPanelRoute>;
-        language?: import("../../i18n").PanelLanguage;
+        language?: import("../../..").PanelLanguage;
         navigation?: {
             groups: Array<{
                 label: string;

package/dist/core/config/server/build-config.server.d.ts

@@ -1749,13 +1749,13 @@ export declare const buildConfig: <const C extends Config>(config: C) => Promise
                         $Infer: {
                             body: ({
                                 permission: {
-                                    readonly user?: ("create" | "update" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
+                                    readonly user?: ("update" | "create" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
                                     readonly session?: ("delete" | "list" | "revoke")[] | undefined;
                                 };
                                 permissions?: never | undefined;
                             } | {
                                 permissions: {
-                                    readonly user?: ("create" | "update" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
+                                    readonly user?: ("update" | "create" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
                                     readonly session?: ("delete" | "list" | "revoke")[] | undefined;
                                 };
                                 permission?: never | undefined;
@@ -1962,9 +1962,9 @@ export declare const buildConfig: <const C extends Config>(config: C) => Promise
         isValidLocale: (locale: string) => boolean;
         getArea: (slug: string) => import("../types.js").BuiltArea;
         getCollection: (slug: string) => import("../types.js").BuiltCollection;
-        getBySlug: (slug: string) => import("../types.js").BuiltCollection | import("../types.js").BuiltArea;
-        isCollection: (slug: string) => slug is import("../../types/doc.js").CollectionSlug;
-        isArea: (slug: string) => slug is import("../../types/doc.js").AreaSlug;
+        getBySlug: (slug: string) => import("../types.js").BuiltArea | import("../types.js").BuiltCollection;
+        isCollection: (slug?: string) => slug is import("../../types/doc.js").CollectionSlug;
+        isArea: (slug?: string) => slug is import("../../types/doc.js").AreaSlug;
         getDocumentPrototype(slug: import("../../types/doc.js").PrototypeSlug): "area" | "collection";
     };
     readonly plugins: InferPluginsServer<C>;
@@ -3731,13 +3731,13 @@ export declare const buildConfig: <const C extends Config>(config: C) => Promise
                             $Infer: {
                                 body: ({
                                     permission: {
-                                        readonly user?: ("create" | "update" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
+                                        readonly user?: ("update" | "create" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
                                         readonly session?: ("delete" | "list" | "revoke")[] | undefined;
                                     };
                                     permissions?: never | undefined;
                                 } | {
                                     permissions: {
-                                        readonly user?: ("create" | "update" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
+                                        readonly user?: ("update" | "create" | "delete" | "list" | "get" | "set-role" | "ban" | "impersonate" | "set-password")[] | undefined;
                                         readonly session?: ("delete" | "list" | "revoke")[] | undefined;
                                     };
                                     permission?: never | undefined;
@@ -3944,9 +3944,9 @@ export declare const buildConfig: <const C extends Config>(config: C) => Promise
             isValidLocale: (locale: string) => boolean;
             getArea: (slug: string) => import("../types.js").BuiltArea;
             getCollection: (slug: string) => import("../types.js").BuiltCollection;
-            getBySlug: (slug: string) => import("../types.js").BuiltCollection | import("../types.js").BuiltArea;
-            isCollection: (slug: string) => slug is import("../../types/doc.js").CollectionSlug;
-            isArea: (slug: string) => slug is import("../../types/doc.js").AreaSlug;
+            getBySlug: (slug: string) => import("../types.js").BuiltArea | import("../types.js").BuiltCollection;
+            isCollection: (slug?: string) => slug is import("../../types/doc.js").CollectionSlug;
+            isArea: (slug?: string) => slug is import("../../types/doc.js").AreaSlug;
             getDocumentPrototype(slug: import("../../types/doc.js").PrototypeSlug): "area" | "collection";
         };
         setLocale(locale: string | undefined): void;
@@ -3997,7 +3997,7 @@ declare function augmentConfig<T extends Config>(config: T): T & {
     readonly panel: {
         $access: (user?: import("../../../types.js").User) => boolean;
         routes?: Record<string, import("../types.js").CustomPanelRoute>;
-        language?: import("../../i18n/index.js").PanelLanguage;
+        language?: import("../../..").PanelLanguage;
         navigation?: {
             groups: Array<{
                 label: string;