@easy-cms/core 0.46.0 → 0.47.1

package/dist/chunk-C4KJ5TFK.js

@@ -0,0 +1,48 @@
+// src/conditions.ts
+var empty = (value) => value === void 0 || value === null || value === "" || value === false || Array.isArray(value) && value.length === 0;
+var plain = (value) => value && typeof value === "object" && !Array.isArray(value) && "id" in value ? value.id : value;
+var same = (a, b) => {
+  const x = plain(a);
+  const y = plain(b);
+  if (Array.isArray(x)) return x.some((v) => same(v, y));
+  return x === y || x !== null && y !== null && x !== void 0 && String(x) === String(y);
+};
+function read(data, path) {
+  let current = data;
+  for (const key of path.split(".")) {
+    if (typeof current !== "object" || current === null) return void 0;
+    current = current[key];
+  }
+  return current;
+}
+function matchesCondition(condition, data) {
+  if ("and" in condition) return condition.and.every((c) => matchesCondition(c, data));
+  if ("or" in condition) return condition.or.some((c) => matchesCondition(c, data));
+  if ("not" in condition) return !matchesCondition(condition.not, data);
+  const value = read(data, condition.field);
+  if (condition.exists !== void 0 && empty(value) === condition.exists) return false;
+  if ("equals" in condition && !same(value, condition.equals)) return false;
+  if ("notEquals" in condition && same(value, condition.notEquals)) return false;
+  if (condition.in && !condition.in.some((v) => same(value, v))) return false;
+  return true;
+}
+function conditionIssues(condition, siblings) {
+  if (typeof condition !== "object" || condition === null || Array.isArray(condition))
+    return ['must be an object, e.g. { field: "type", equals: "link" }'];
+  const c = condition;
+  if (Array.isArray(c.and)) return c.and.flatMap((x) => conditionIssues(x, siblings));
+  if (Array.isArray(c.or)) return c.or.flatMap((x) => conditionIssues(x, siblings));
+  if ("not" in c) return conditionIssues(c.not, siblings);
+  if (typeof c.field !== "string" || c.field === "") return ["needs `field`, a sibling field"];
+  const first = c.field.split(".")[0];
+  if (!siblings.includes(first)) return [`"${c.field}" is not a field beside it`];
+  if (c.in !== void 0 && !Array.isArray(c.in)) return ["`in` must be a list"];
+  if (c.exists !== void 0 && typeof c.exists !== "boolean")
+    return ["`exists` must be true or false"];
+  return [];
+}
+
+export {
+  matchesCondition,
+  conditionIssues
+};

package/dist/conditions.d.ts

@@ -0,0 +1,31 @@
+/**
+ * When a field is shown, from its sibling fields' values (the fields beside it, in its group,
+ * array row or block):
+ *
+ * - `{ field: 'linkType', equals: 'external' }`, also `notEquals`, `in: [...]`, `exists: true`
+ * - `{ and: [...] }`, `{ or: [...] }`, `{ not: … }`
+ *
+ * A hidden field isn't required, and keeps its value.
+ */
+type FieldCondition = {
+    /** A sibling field's name; a path with `.` reads inside a group, e.g. `link.type`. */
+    readonly field: string;
+    readonly equals?: unknown;
+    readonly notEquals?: unknown;
+    readonly in?: readonly unknown[];
+    /** `true`: has a value (not empty); `false`: empty. */
+    readonly exists?: boolean;
+} | {
+    readonly and: readonly FieldCondition[];
+} | {
+    readonly or: readonly FieldCondition[];
+} | {
+    readonly not: FieldCondition;
+};
+type Data = Record<string, unknown>;
+/** Whether a condition holds for the sibling data. */
+declare function matchesCondition(condition: FieldCondition, data: Data): boolean;
+/** Problems with a condition, for the config's checks; `[]` when it's fine. */
+declare function conditionIssues(condition: unknown, siblings: readonly string[]): string[];
+
+export { type FieldCondition, conditionIssues, matchesCondition };

package/dist/conditions.js

@@ -0,0 +1,8 @@
+import {
+  conditionIssues,
+  matchesCondition
+} from "./chunk-C4KJ5TFK.js";
+export {
+  conditionIssues,
+  matchesCondition
+};

package/dist/index.d.ts

@@ -1,3 +1,6 @@
+import { FieldCondition } from './conditions.js';
+export { conditionIssues, matchesCondition } from './conditions.js';
+
 /** A document id. SQLite uses integers, Postgres may use either. */
 type ID = string | number;
 type Role = 'admin' | 'editor' | (string & {});
@@ -885,7 +888,10 @@ type InputValue<F extends Field> = F extends {
     readonly type: 'blocks';
     readonly blocks: infer B extends readonly Block[];
 } ? readonly BlockInput<B[number]>[] : FieldValue<F>;
-/** Required fields must be given, unless Easy CMS can fill them (default value, slug from another field). */
+/**
+ * Required fields must be given, unless Easy CMS can fill them (default value, slug from another
+ * field) or a condition may hide them (`admin.condition`).
+ */
 type NeedsInput<F extends Field> = F extends {
     readonly required: true;
 } ? F extends {
@@ -893,6 +899,10 @@ type NeedsInput<F extends Field> = F extends {
 } ? never : F extends {
     readonly type: 'slug';
     readonly from: string;
+} ? never : F extends {
+    readonly admin: {
+        readonly condition: object;
+    };
 } ? never : F : never;
 type FieldsInput<Fs extends readonly Field[]> = Simplify<{
     -readonly [F in NeedsInput<Visible<Fs>> as F['name']]: InputValue<F>;
@@ -1853,6 +1863,15 @@ type AdminComponent = string | {
 };
 /** How the admin shows a field, with components from admin modules. */
 interface FieldAdmin {
+    /** Help below the field's label. */
+    readonly description?: Label;
+    /** Its share of a row (`admin.layout`'s `row`). Default: an equal share. */
+    readonly width?: '1/4' | '1/3' | '1/2' | '2/3' | '3/4' | 'full';
+    /**
+     * Shown only when its sibling fields match, e.g. `{ field: 'linkType', equals: 'external' }`.
+     * A hidden field isn't required. See `FieldCondition`.
+     */
+    readonly condition?: FieldCondition;
     /** Shown instead of the field's input; the admin keeps the label and error messages. */
     readonly component?: AdminComponent;
     /** Shown below the field, e.g. a length meter or a preview. */
@@ -2471,18 +2490,72 @@ interface VersionsConfig {
     /** Versions kept per document; older ones are deleted. Default 50. */
     readonly max?: number;
 }
+/** A panel of an edit page's side column: a component, at the top or (default) below the rest. */
+type SidebarPanel = AdminComponent | {
+    readonly tag: string;
+    readonly props?: Readonly<Record<string, unknown>>;
+    /** `top`: right below publishing, above the side fields. Default: below them. */
+    readonly position?: 'top';
+};
+/**
+ * Where the edit page puts its fields: tabs, collapsible sections and rows, by field name. Only
+ * how they look: the data stays as the fields say. Fields not placed follow at the end (in the
+ * first tab). Top-level fields; sidebar fields stay in the side column.
+ *
+ * ```ts
+ * layout: [
+ *   { tab: 'Content', fields: ['title', { row: ['author', 'category'] }, 'body'] },
+ *   { tab: 'SEO', fields: ['meta'] },
+ * ]
+ * ```
+ */
+type LayoutNode = string | {
+    readonly row: readonly string[];
+} | {
+    readonly collapsible: Label;
+    /** Starts folded. */
+    readonly collapsed?: boolean;
+    readonly description?: Label;
+    readonly fields: readonly LayoutNode[];
+} | {
+    readonly tab: Label;
+    readonly description?: Label;
+    readonly fields: readonly LayoutNode[];
+};
 /** Custom admin components for a collection's or global's edit page. */
 interface ContainerAdmin {
-    /** Panels in the edit page's side column, below publishing (components from admin modules). */
-    readonly sidebar?: readonly AdminComponent[];
+    /** Panels in the edit page's side column (components from admin modules). */
+    readonly sidebar?: readonly SidebarPanel[];
+    /** Tabs, collapsible sections and rows of the edit page. See `LayoutNode`. */
+    readonly layout?: readonly LayoutNode[];
+    /**
+     * Its menu group: a group's id (`admin.nav`), e.g. `shop` or `shop.catalog`; `settings` for
+     * Settings; or a label, which makes a group of that name. Default: Content for collections,
+     * Settings › Site for globals.
+     */
+    readonly group?: 'settings' | Label;
 }
 interface CollectionAdmin extends ContainerAdmin {
     /**
-     * `settings` lists the collection under Settings in the admin menu (with Users and API keys)
-     * instead of with the content, e.g. for redirects or forms settings. A label (e.g.
-     * `{ en: 'Shop', th: 'ร้านค้า' }`) lists it under a heading of that name, after the content.
+     * A number that needs attention, next to its menu item: the documents matching `where` (that
+     * the user may read), e.g. orders to send. `tone`: `accent` (default), `warning` or `danger`.
      */
-    readonly group?: 'settings' | Label;
+    readonly badge?: {
+        readonly where: Where;
+        readonly tone?: 'accent' | 'warning' | 'danger';
+        /** What the number counts, for screen readers, e.g. `{ en: 'to send', th: 'รอจัดส่ง' }`. */
+        readonly label?: Label;
+    };
+    /** The number of documents beside its menu item. Default `true`. */
+    readonly count?: boolean;
+    /** The list with no documents yet: what to say, and a link, e.g. to a guide. */
+    readonly empty?: {
+        readonly description?: Label;
+        readonly link?: {
+            readonly label: Label;
+            readonly href: string;
+        };
+    };
     readonly list?: CollectionListAdmin;
     /**
      * With `auth.rbac`: the relationship field to `users` that names a document's owner, e.g.
@@ -2584,6 +2657,26 @@ interface AdminBrand {
     /** Main color as `#rrggbb`; lighter and darker shades are derived from it. */
     readonly color?: string;
 }
+/** A group of the admin menu (`admin.nav`). */
+interface NavGroup {
+    /** Lowercase letters, digits and `-`; children are named `<parent>.<child>`, e.g. `shop.catalog`. */
+    readonly id: string;
+    readonly label: Label;
+    readonly icon?: AdminIcon;
+    /** Its place among the groups: lower first. Content is 0, the media library 10, Settings 1000. */
+    readonly order?: number;
+    /** Groups inside it, one level. */
+    readonly children?: readonly Omit<NavGroup, 'children'>[];
+}
+/** An entry of the command palette (⌘K) that opens a page of the admin. */
+interface AdminCommand {
+    readonly label: Label;
+    /** A path in the admin, e.g. `/collections/orders?f_status=paid`. */
+    readonly to: string;
+    readonly icon?: AdminIcon;
+    /** Words that find it besides its label. */
+    readonly keywords?: readonly string[];
+}
 /** Who may see an admin page or dashboard widget. Default: every logged-in user. */
 type AdminViewAccess = (args: {
     readonly user: AuthUser;
@@ -2598,8 +2691,11 @@ interface AdminPage {
     readonly label: Label;
     /** Icon in the admin menu. Default `file-text`. */
     readonly icon?: AdminIcon;
-    /** Listed under Content (default) or Settings in the menu, or not listed (`false`): reached by links. */
-    readonly group?: 'content' | 'settings' | false;
+    /**
+     * Its menu group: `content` (default), `settings`, a group's id (`admin.nav`) or a label; `false`:
+     * not listed, reached by links.
+     */
+    readonly group?: 'content' | 'settings' | false | Label;
     /** Who may open it. Pages a user may not open are left out of their admin. */
     readonly access?: AdminViewAccess;
 }
@@ -2631,6 +2727,15 @@ interface AdminConfig {
      * Collections not listed follow in config order, with the media library last.
      */
     readonly menu?: readonly string[];
+    /**
+     * The admin menu's groups, which collections, globals and pages name in `admin.group`, e.g.
+     * `{ id: 'shop', label: 'Shop', icon: 'store', children: [{ id: 'catalog', label: 'Catalog' }] }`.
+     * Built in: `content` and `settings` (with `site`, `people` and `system`); declaring one of
+     * their ids changes its label, icon or order. Plugins declare their own.
+     */
+    readonly nav?: readonly NavGroup[];
+    /** More entries of the command palette (⌘K), e.g. a plugin's page with a filter. */
+    readonly commands?: readonly AdminCommand[];
     /**
      * JavaScript modules the admin loads after login, which define Web Components used by
      * fields (`admin.component`, `admin.after`) and edit pages (`admin.sidebar`). Each entry is a
@@ -3317,6 +3422,9 @@ declare function imageDimensions(data: Uint8Array, type: string): {
     height: number;
 } | undefined;
 
+/** The menu's groups that are always there. Declaring their ids changes labels, icons, order. */
+declare const BUILTIN_NAV: readonly NavGroup[];
+
 declare const DEFAULT_DEPTH = 1;
 declare const MAX_DEPTH = 3;
 /** Loads the documents of one collection that the caller may see. */
@@ -3415,7 +3523,51 @@ declare function resolveAdminModule(specifier: string, cwd?: string): string | u
 interface AdminComponentRef {
     tag: string;
     props?: Record<string, unknown>;
+    /** A side panel at the top of the side column (`position: 'top'`). */
+    position?: 'top';
+}
+/** Where the edit page puts its fields (`admin.layout`), with unplaced fields filled in. */
+type AdminLayoutNode = {
+    type: 'field';
+    name: string;
+} | {
+    type: 'row';
+    fields: string[];
+} | {
+    type: 'collapsible';
+    label: Label;
+    collapsed?: boolean;
+    description?: Label;
+    nodes: AdminLayoutNode[];
+} | {
+    type: 'tab';
+    label: Label;
+    description?: Label;
+    nodes: AdminLayoutNode[];
+};
+/** An entry of the admin menu. */
+type AdminNavItem = {
+    kind: 'collection';
+    slug: string;
+} | {
+    kind: 'global';
+    slug: string;
+} | {
+    kind: 'page';
+    path: string;
+} | {
+    kind: 'view';
+    view: 'roles' | 'sso' | 'backups' | 'email' | 'deliveries' | 'audit';
+};
+/** A group of the admin menu (`admin.nav`), with what this user may open in it. */
+interface AdminNavGroup {
+    kind: 'group';
+    id: string;
+    label: Label;
+    icon?: string;
+    items: AdminNavNode[];
 }
+type AdminNavNode = AdminNavItem | AdminNavGroup;
 /** A field as the admin UI sees it: plain JSON, no functions. */
 interface AdminField {
     name: string;
@@ -3474,6 +3626,12 @@ interface AdminField {
     noCreate?: boolean;
     /** A field of an added type (`fieldTypes`), e.g. `color`; `type` is the base it's stored as. */
     customType?: string;
+    /** Help below its label (`admin.description`). */
+    description?: Label;
+    /** Its share of a row (`admin.width`). */
+    width?: string;
+    /** Shown only when its siblings match (`admin.condition`). */
+    condition?: FieldCondition;
 }
 interface AdminCollection {
     slug: string;
@@ -3494,10 +3652,23 @@ interface AdminCollection {
     fields: AdminField[];
     /** Panels from admin modules in the edit page's side column. */
     sidebar?: AdminComponentRef[];
-    /** Listed under Settings in the menu (users, API keys, `admin.group: 'settings'`). */
-    group?: 'settings';
-    /** Listed under a heading of its own in the menu (`admin.group` with a label). */
-    section?: Label;
+    /** Tabs, sections and rows of the edit page (`admin.layout`). */
+    layout?: AdminLayoutNode[];
+    /** A number in the menu (`admin.badge`); the menu's counts come from `GET <api>/admin/counts`. */
+    badge?: {
+        tone: 'accent' | 'warning' | 'danger';
+        label?: Label;
+    };
+    /** No document count beside it in the menu (`admin.count: false`). */
+    noCount?: boolean;
+    /** What the list says while it has no documents (`admin.empty`). */
+    empty?: {
+        description?: Label;
+        link?: {
+            label: Label;
+            href: string;
+        };
+    };
     /** The list is a tree along this relationship field (`admin.list.tree`). */
     tree?: string;
     /** The list's default order (`admin.list.sort`). */
@@ -3530,6 +3701,8 @@ interface AdminGlobal {
     fields: AdminField[];
     /** Panels from admin modules in the edit page's side column. */
     sidebar?: AdminComponentRef[];
+    /** Tabs, sections and rows of the edit page (`admin.layout`). */
+    layout?: AdminLayoutNode[];
     permissions: {
         read: boolean;
         update: boolean;
@@ -3541,8 +3714,6 @@ interface AdminPageRef {
     path: string;
     label: Label;
     icon?: string;
-    /** Where it is listed in the menu; `false`: not listed. */
-    group: 'content' | 'settings' | false;
     component: AdminComponentRef;
 }
 /** A dashboard panel (`admin.dashboard`) this user may see. */
@@ -3558,6 +3729,15 @@ interface AdminSchema {
     passwordLinks: boolean;
     /** Menu order of collections (`admin.menu`); unlisted ones follow. */
     menu: string[];
+    /** The menu: groups and what this user may open in them, in order. */
+    nav: AdminNavNode[];
+    /** More entries of the command palette (`admin.commands`). */
+    commands: {
+        label: Label;
+        to: string;
+        icon?: string;
+        keywords?: string[];
+    }[];
     /** Content locales, when the config has `localization`. */
     localization: {
         locales: string[];
@@ -3607,6 +3787,13 @@ interface AdminSchema {
     dashboard: AdminWidgetRef[];
 }
 
+interface SearchHit {
+    readonly collection: string;
+    readonly id: ID;
+    readonly title: string;
+    readonly status?: string;
+}
+
 /** Something an admin should look at, shown on the dashboard with a link to how to fix it. */
 type AdminAttention = 
 /** Webhook deliveries that failed for good in the last 7 days; `url`: the one failing most. */
@@ -3738,4 +3925,4 @@ declare function validateConfig(config: Config): ConfigIssue[];
 /** The version of `@easy-cms/core`, set when the package is built. */
 declare const VERSION: string;
 
-export { ADMIN_ICONS, API_KEYS, API_KEY_GLOBAL_OPERATIONS, API_KEY_OPERATIONS, type Access, type AccessArgs, type AccessOptions, type AdminAttention, type AdminBackup, type AdminBackups, type AdminBrand, type AdminCollection, type AdminComponent, type AdminComponentRef, type AdminConfig, type AdminDeliveries, type AdminDelivery, type AdminEmail, type AdminEmailDelivery, type AdminField, type AdminFieldArgs, type AdminGlobal, type AdminIcon, type AdminLocale, type AdminPage, type AdminPageRef, type AdminRole, type AdminRoleChange, type AdminRoleField, type AdminRoleTarget, type AdminRoleView, type AdminRoles, type AdminSchema, type AdminSso, type AdminStatus, type AdminSwitcher, type AdminViewAccess, type AdminWebhookDelivery, type AdminWidgetRef, type AfterChangeHook, type AfterDeleteHook, type AfterReadHook, type ApiHandlerOptions, type ApiKeyContext, type ApiKeyGlobalOperation, type ApiKeyOperation, type ApiKeyPermissions, type ArrayField, type AuditChange, type AuditConfig, type AuditEntry, AuditLog, type AuditPage, type AuditVerification, Auth, type AuthConfig, type AuthProvider, type AuthProviderProfile, type AuthProviderRequest, type AuthUser, BUILTIN_COLLECTIONS, type BackupState, type BackupsConfig, type BeforeChangeHook, type BeforeDeleteHook, type BeforeValidateHook, type Block, type BlocksField, type BooleanField, type BuiltinApiKeysCollection, type BuiltinMediaCollection, type BuiltinMediaFoldersCollection, type BuiltinUsersCollection, type BundleHints, CONFIG_FILE_NAMES, CSRF_COOKIE, CSRF_HEADER, type CliCommand, type CollectionAccess, type CollectionAdmin, type CollectionConfig, type CollectionDocument, type CollectionHooks, type CollectionListAdmin, type CollectionSlug, type Config, ConfigError, type ConfigIssue, type ContainerAdmin, type CopyProgress, type CopyResult, type CreateEasyCMSOptions, type CreateInput, type CreateMigrationResult, type CustomField, type CustomFieldTypes, DEFAULT_ADMIN_PATH, DEFAULT_API_PATH, DEFAULT_DEPTH, DEFAULT_MAX_FILE_SIZE, DEFAULT_MAX_VERSIONS, DEFAULT_PASSWORD_EMAILS, DEFAULT_TOKEN_EXPIRATION, type DashboardWidget, type Database, type DatabaseAdapter, type DatabaseInitArgs, type DatabaseTransfer, type DateField, type DeliveryKind, type DeliveryState, type DepthOptions, type DirectUpload, type DocumentOf, EXTENSIONS, EasyCMS, EasyCMSError, type EmailAdapter, type EmailCheck, type EmailField, type EmailMessage, type EmailSetting, type Endpoint, type EndpointRequest, FIELD_TYPES, FIELD_TYPE_BASES, FOLDER_LEVELS, type Field, type FieldAccess, type FieldAccessFn, type FieldAdmin, type FieldError, type FieldRule, type FieldType, type FieldTypeBase, type FieldTypeDefinition, type FieldTypeValidateContext, type FieldValidate, type FieldValidateContext, type FieldValue, type FieldsInput, type FieldsValue, type FilterOptions, type FilterOptionsArgs, type FindArgs, type FindOptions, type FolderLevel, type FolderPermissions, ForbiddenError, type GlobalAccess, type GlobalConfig, type GlobalDocument, type GlobalHooks, type GlobalInput, type GlobalSlug, type GroupField, type ID, INTERNAL_COLLECTIONS, type ImageSize, type IncrementOptions, type InferCollection, type InferGlobal, type JobConfig, type JsonField, type Label, type LivePreview, type LoadConfigOptions, type LocalStorageOptions, type LocalizationConfig, type Logger, type LoginArgs, MAX_DEPTH, MEDIA, MEDIA_FOLDERS, MIME_GROUPS, MIN_PASSWORD_LENGTH, MIN_SECRET_LENGTH, type MediaDocument, MediaFolders, type MediaSize, type MembersConfig, type MembersSignup, type MigrationInfo, NotFoundError, type NumberField, type OnRequest, type OnRequestArgs, type Operation, type PaginatedDocs, type PasswordEmail, type PasswordEmailArgs, type PasswordEmailFn, type PasswordLinkOptions, PayloadTooLargeError, type Plugin, type PluginInfo, type PluginTypes, type PreviewTarget, type PreviewURL, QueryError, ROLE_OPERATIONS, type RawDocument, type ReadOptions, type RelationshipField, type RequestContext, type ResolvedConfig, type RestHandler, type RestHandlerOptions, type RichTextDocument, type RichTextField, type Role, type RoleOperation, type RolePermissions, Roles, type RoutesConfig, SESSION_COOKIE, SSO_COOKIE, type ScheduledJob, SchemaError, type SchemaMode, type SelectField, type SelectOption, type Session, type SignupArgs, type SignupResult, type SlugField, type SlugOf, type SsoOutcome, type SsoProviderRef, type StorageAdapter, type StoredFile, type TextField, type TextareaField, TooManyRequestsError, type TypedPlugin, UnauthorizedError, type UpdateInput, type UpdateOptions, type UploadConfig, type UploadField, type UploadFromURLConfig, type UserIdentity, VERSION, ValidationError, type Version, type VersionSummary, type VersionsConfig, WEBHOOK_EVENTS, type WebhookConfig, type WebhookEvent, type WebhookPayload, type Where, type WhereOperators, anyone, applyDefaults, applyPlugins, checkFormToken, configSignature, consoleEmail, consoleLogger, copyDatabase, createApiHandler, createEasyCMS, createRestHandler, createRootEndpointHandler, defineConfig, defineFieldType, definePlugin, expandMimeTypes, fillMissing, findConfigFile, formToken, generateSlugs, generateTypes, hasRows, hashPassword, honeypotName, imageDimensions, importConfig, isAdmin, isHasMany, isLoggedIn, isSignedIn, isSystemAdmin, keyAllows, loadConfig, localStorage, mergeForUpdate, mimeAllowed, mimeAllowedBy, parseId, populate, rateKeys, readCookie, resolveAdminModule, resolveConfig, rowFields, sharedEasyCMS, silentLogger, singularize, slugify, sniffMimeType, uniqueWithinOf, validateConfig, validateFields, verifyPassword, verifyTurnstile, writeBackupFile };
+export { ADMIN_ICONS, API_KEYS, API_KEY_GLOBAL_OPERATIONS, API_KEY_OPERATIONS, type Access, type AccessArgs, type AccessOptions, type AdminAttention, type AdminBackup, type AdminBackups, type AdminBrand, type AdminCollection, type AdminCommand, type AdminComponent, type AdminComponentRef, type AdminConfig, type AdminDeliveries, type AdminDelivery, type AdminEmail, type AdminEmailDelivery, type AdminField, type AdminFieldArgs, type AdminGlobal, type AdminIcon, type AdminLayoutNode, type AdminLocale, type AdminNavGroup, type AdminNavItem, type AdminNavNode, type AdminPage, type AdminPageRef, type AdminRole, type AdminRoleChange, type AdminRoleField, type AdminRoleTarget, type AdminRoleView, type AdminRoles, type AdminSchema, type AdminSso, type AdminStatus, type AdminSwitcher, type AdminViewAccess, type AdminWebhookDelivery, type AdminWidgetRef, type AfterChangeHook, type AfterDeleteHook, type AfterReadHook, type ApiHandlerOptions, type ApiKeyContext, type ApiKeyGlobalOperation, type ApiKeyOperation, type ApiKeyPermissions, type ArrayField, type AuditChange, type AuditConfig, type AuditEntry, AuditLog, type AuditPage, type AuditVerification, Auth, type AuthConfig, type AuthProvider, type AuthProviderProfile, type AuthProviderRequest, type AuthUser, BUILTIN_COLLECTIONS, BUILTIN_NAV, type BackupState, type BackupsConfig, type BeforeChangeHook, type BeforeDeleteHook, type BeforeValidateHook, type Block, type BlocksField, type BooleanField, type BuiltinApiKeysCollection, type BuiltinMediaCollection, type BuiltinMediaFoldersCollection, type BuiltinUsersCollection, type BundleHints, CONFIG_FILE_NAMES, CSRF_COOKIE, CSRF_HEADER, type CliCommand, type CollectionAccess, type CollectionAdmin, type CollectionConfig, type CollectionDocument, type CollectionHooks, type CollectionListAdmin, type CollectionSlug, type Config, ConfigError, type ConfigIssue, type ContainerAdmin, type CopyProgress, type CopyResult, type CreateEasyCMSOptions, type CreateInput, type CreateMigrationResult, type CustomField, type CustomFieldTypes, DEFAULT_ADMIN_PATH, DEFAULT_API_PATH, DEFAULT_DEPTH, DEFAULT_MAX_FILE_SIZE, DEFAULT_MAX_VERSIONS, DEFAULT_PASSWORD_EMAILS, DEFAULT_TOKEN_EXPIRATION, type DashboardWidget, type Database, type DatabaseAdapter, type DatabaseInitArgs, type DatabaseTransfer, type DateField, type DeliveryKind, type DeliveryState, type DepthOptions, type DirectUpload, type DocumentOf, EXTENSIONS, EasyCMS, EasyCMSError, type EmailAdapter, type EmailCheck, type EmailField, type EmailMessage, type EmailSetting, type Endpoint, type EndpointRequest, FIELD_TYPES, FIELD_TYPE_BASES, FOLDER_LEVELS, type Field, type FieldAccess, type FieldAccessFn, type FieldAdmin, FieldCondition, type FieldError, type FieldRule, type FieldType, type FieldTypeBase, type FieldTypeDefinition, type FieldTypeValidateContext, type FieldValidate, type FieldValidateContext, type FieldValue, type FieldsInput, type FieldsValue, type FilterOptions, type FilterOptionsArgs, type FindArgs, type FindOptions, type FolderLevel, type FolderPermissions, ForbiddenError, type GlobalAccess, type GlobalConfig, type GlobalDocument, type GlobalHooks, type GlobalInput, type GlobalSlug, type GroupField, type ID, INTERNAL_COLLECTIONS, type ImageSize, type IncrementOptions, type InferCollection, type InferGlobal, type JobConfig, type JsonField, type Label, type LayoutNode, type LivePreview, type LoadConfigOptions, type LocalStorageOptions, type LocalizationConfig, type Logger, type LoginArgs, MAX_DEPTH, MEDIA, MEDIA_FOLDERS, MIME_GROUPS, MIN_PASSWORD_LENGTH, MIN_SECRET_LENGTH, type MediaDocument, MediaFolders, type MediaSize, type MembersConfig, type MembersSignup, type MigrationInfo, type NavGroup, NotFoundError, type NumberField, type OnRequest, type OnRequestArgs, type Operation, type PaginatedDocs, type PasswordEmail, type PasswordEmailArgs, type PasswordEmailFn, type PasswordLinkOptions, PayloadTooLargeError, type Plugin, type PluginInfo, type PluginTypes, type PreviewTarget, type PreviewURL, QueryError, ROLE_OPERATIONS, type RawDocument, type ReadOptions, type RelationshipField, type RequestContext, type ResolvedConfig, type RestHandler, type RestHandlerOptions, type RichTextDocument, type RichTextField, type Role, type RoleOperation, type RolePermissions, Roles, type RoutesConfig, SESSION_COOKIE, SSO_COOKIE, type ScheduledJob, SchemaError, type SchemaMode, type SearchHit, type SelectField, type SelectOption, type Session, type SidebarPanel, type SignupArgs, type SignupResult, type SlugField, type SlugOf, type SsoOutcome, type SsoProviderRef, type StorageAdapter, type StoredFile, type TextField, type TextareaField, TooManyRequestsError, type TypedPlugin, UnauthorizedError, type UpdateInput, type UpdateOptions, type UploadConfig, type UploadField, type UploadFromURLConfig, type UserIdentity, VERSION, ValidationError, type Version, type VersionSummary, type VersionsConfig, WEBHOOK_EVENTS, type WebhookConfig, type WebhookEvent, type WebhookPayload, type Where, type WhereOperators, anyone, applyDefaults, applyPlugins, checkFormToken, configSignature, consoleEmail, consoleLogger, copyDatabase, createApiHandler, createEasyCMS, createRestHandler, createRootEndpointHandler, defineConfig, defineFieldType, definePlugin, expandMimeTypes, fillMissing, findConfigFile, formToken, generateSlugs, generateTypes, hasRows, hashPassword, honeypotName, imageDimensions, importConfig, isAdmin, isHasMany, isLoggedIn, isSignedIn, isSystemAdmin, keyAllows, loadConfig, localStorage, mergeForUpdate, mimeAllowed, mimeAllowedBy, parseId, populate, rateKeys, readCookie, resolveAdminModule, resolveConfig, rowFields, sharedEasyCMS, silentLogger, singularize, slugify, sniffMimeType, uniqueWithinOf, validateConfig, validateFields, verifyPassword, verifyTurnstile, writeBackupFile };

package/dist/index.js

@@ -1,3 +1,8 @@
+import {
+  conditionIssues,
+  matchesCondition
+} from "./chunk-C4KJ5TFK.js";
+
 // src/access.ts
 var isSystemAdmin = (user) => user?.role === "admin" && !user.apiKey && user.scoped !== true;
 var anyone = () => true;
@@ -3003,6 +3008,9 @@ async function validateFields(fields, input, options, prefix = "") {
     const path = prefix + field.name;
     const raw = input[field.name];
     const fail = (message2) => errors.push({ field: path, message: message2 });
+    const condition = field.admin?.condition;
+    const skipRequired = options.skipRequired === true || condition !== void 0 && !matchesCondition(condition, input);
+    const fieldOptions = skipRequired === (options.skipRequired === true) ? options : { ...options, skipRequired };
     if (field.type === "group") {
       if (!isEmpty(raw) && !isPlainObject(raw)) {
         fail("must be an object");
@@ -3011,7 +3019,7 @@ async function validateFields(fields, input, options, prefix = "") {
       const sub = await validateFields(
         field.fields,
         isPlainObject(raw) ? raw : {},
-        options,
+        fieldOptions,
         `${path}.`
       );
       data[field.name] = sub.data;
@@ -3034,7 +3042,7 @@ async function validateFields(fields, input, options, prefix = "") {
         const failLocale = (message2) => errors.push({ field: localePath, message: message2 });
         const value2 = map[locale];
         if (isEmpty(value2) || Array.isArray(value2) && value2.length === 0) {
-          if (own && field.required && !options.skipRequired) failLocale("is required");
+          if (own && field.required && !skipRequired) failLocale("is required");
           out[locale] = hasRows(field) || isHasMany(field) ? [] : null;
           if (own && !field.required) await runCustom(field, null, options, failLocale);
           continue;
@@ -3043,7 +3051,7 @@ async function validateFields(fields, input, options, prefix = "") {
           field,
           value2,
           localePath,
-          options,
+          fieldOptions,
           failLocale,
           errors,
           references2
@@ -3056,14 +3064,14 @@ async function validateFields(fields, input, options, prefix = "") {
       continue;
     }
     if (isEmpty(raw) || Array.isArray(raw) && raw.length === 0) {
-      if (field.required && !options.skipRequired) fail("is required");
-      else if (!options.skipRequired && "minRows" in field && field.minRows)
+      if (field.required && !skipRequired) fail("is required");
+      else if (!skipRequired && "minRows" in field && field.minRows)
         fail(`must have at least ${itemsOf(field, field.minRows)}`);
       data[field.name] = hasRows(field) || isHasMany(field) ? [] : null;
       if (!field.required) await runCustom(field, null, options, fail);
       continue;
     }
-    const value = await normalizeValue(field, raw, path, options, fail, errors, references2);
+    const value = await normalizeValue(field, raw, path, fieldOptions, fail, errors, references2);
     if (value === void 0) continue;
     data[field.name] = value;
     await runCustom(field, value, options, fail);
@@ -4837,6 +4845,70 @@ function rank(role, config) {
   return index === -1 ? config.auth.roles.length : index;
 }
 
+// src/nav.ts
+var BUILTIN_NAV = [
+  { id: "content", label: { en: "Content", th: "\u0E40\u0E19\u0E37\u0E49\u0E2D\u0E2B\u0E32" }, icon: "file-text", order: 0 },
+  {
+    id: "settings",
+    label: { en: "Settings", th: "\u0E15\u0E31\u0E49\u0E07\u0E04\u0E48\u0E32" },
+    icon: "settings",
+    order: 1e3,
+    children: [
+      { id: "site", label: { en: "Site", th: "\u0E40\u0E27\u0E47\u0E1A\u0E44\u0E0B\u0E15\u0E4C" }, icon: "globe" },
+      { id: "people", label: { en: "Users & access", th: "\u0E1C\u0E39\u0E49\u0E43\u0E0A\u0E49\u0E41\u0E25\u0E30\u0E2A\u0E34\u0E17\u0E18\u0E34\u0E4C" }, icon: "users" },
+      { id: "system", label: { en: "System", th: "\u0E23\u0E30\u0E1A\u0E1A" }, icon: "sliders-horizontal" }
+    ]
+  }
+];
+var MEDIA_ORDER = 10;
+var LABEL_ORDER = 500;
+var NAV_ID = /^[a-z][a-z0-9-]*$/;
+function mergeGroups(lists, parent = "") {
+  const byId = /* @__PURE__ */ new Map();
+  let index = 0;
+  for (const list of lists)
+    for (const group of list) {
+      const found = byId.get(group.id);
+      if (found) {
+        found.group = { ...group, ...stripUndefined(found.group) };
+        if (group.children) found.children.push([...group.children]);
+      } else {
+        byId.set(group.id, {
+          group,
+          children: group.children ? [[...group.children]] : [],
+          index: index++
+        });
+      }
+    }
+  return [...byId.values()].map(({ group, children, index: index2 }) => ({
+    id: parent ? `${parent}.${group.id}` : group.id,
+    label: group.label,
+    ...group.icon ? { icon: group.icon } : {},
+    order: group.order ?? 100 + index2,
+    children: mergeGroups(children, parent ? `${parent}.${group.id}` : group.id)
+  })).sort((a, b) => a.order - b.order);
+}
+function stripUndefined(value) {
+  return Object.fromEntries(Object.entries(value).filter(([, v]) => v !== void 0));
+}
+function navGroups(declared) {
+  return mergeGroups([declared, BUILTIN_NAV]);
+}
+function navIds(groups) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const g of groups) {
+    ids.add(g.id);
+    for (const c of g.children) ids.add(c.id);
+  }
+  return ids;
+}
+function groupOf(group, ids, fallback) {
+  if (group === void 0 || group === null) return { id: fallback };
+  if (group === "settings") return { id: "settings.site" };
+  if (typeof group === "string" && ids.has(group)) return { id: group };
+  return { id: `label:${JSON.stringify(group)}`, label: group };
+}
+
 // src/webhooks.ts
 import { createHmac as createHmac5, randomUUID as randomUUID2 } from "crypto";
 var WEBHOOK_EVENTS = [
@@ -5091,11 +5163,13 @@ function validateConfig(config) {
   validateEvents(config, add);
   const apiKeys = config.apiKeys;
   if (apiKeys !== void 0 && typeof apiKeys !== "boolean") add("apiKeys", "must be true or false");
+  const nav = validateNav(config, add);
   collections.forEach((collection2, i) => {
     const path = `collections.${collection2.slug ?? `[${i}]`}`;
     validateContainer(collection2, path, collectionSlugs, add, {
       collection: true,
-      rbac: config.auth?.rbac === true
+      rbac: config.auth?.rbac === true,
+      nav
     });
     validateUseAsTitle(collection2, path, add);
     validateIcon(collection2, path, add);
@@ -5107,7 +5181,8 @@ function validateConfig(config) {
     const path = `globals.${global2.slug ?? `[${i}]`}`;
     validateContainer(global2, path, collectionSlugs, add, {
       collection: false,
-      rbac: config.auth?.rbac === true
+      rbac: config.auth?.rbac === true,
+      nav
     });
     validateIcon(global2, path, add);
   });
@@ -5240,8 +5315,8 @@ function validateAdminViews(config, add) {
             "e.g. label: { en: 'Stats', th: '\u0E2A\u0E16\u0E34\u0E15\u0E34' }"
           );
         validateIcon(p, path, add);
-        if (p.group !== void 0 && p.group !== "content" && p.group !== "settings" && p.group !== false)
-          add(`${path}.group`, 'must be "content", "settings" or false');
+        if (p.group !== "content" && p.group !== false)
+          validateGroup(p.group, navIds(navGroups(config.admin?.nav ?? [])), `${path}.group`, add);
         access(p.access, path);
       });
     }
@@ -5688,7 +5763,142 @@ function checkSlug(container, path, seen, add) {
   seen.add(slug2);
   return slug2;
 }
-function validateContainer(container, path, collectionSlugs, add, { collection: collection2, rbac }) {
+var isLabel = (value) => typeof value === "string" && value.trim() !== "" || typeof value === "object" && value !== null && !Array.isArray(value) && Object.values(value).length > 0 && Object.values(value).every((v) => typeof v === "string");
+function validateNav(config, add) {
+  const nav = config.admin?.nav;
+  if (nav !== void 0) {
+    if (!Array.isArray(nav))
+      add("admin.nav", "must be a list of groups", "e.g. nav: [{ id: 'shop', label: 'Shop' }]");
+    else
+      nav.forEach((group, i) => {
+        const check2 = (g, path, child) => {
+          const { id, label, children, order } = g ?? {};
+          if (typeof id !== "string" || !NAV_ID.test(id))
+            add(`${path}.id`, "must be lowercase letters, digits and -", "e.g. 'shop'");
+          if (!isLabel(label)) add(`${path}.label`, "must be a string or { en, th }");
+          if (order !== void 0 && typeof order !== "number")
+            add(`${path}.order`, "must be a number");
+          validateIcon(g, path, add);
+          if (children !== void 0) {
+            if (child) add(`${path}.children`, "groups go one level deep");
+            else if (!Array.isArray(children)) add(`${path}.children`, "must be a list of groups");
+            else
+              children.forEach((c, j) => {
+                check2(c, `${path}.children[${j}]`, true);
+              });
+          }
+        };
+        check2(group, `admin.nav[${i}]`, false);
+      });
+  }
+  const commands = config.admin?.commands;
+  if (commands !== void 0) {
+    if (!Array.isArray(commands)) add("admin.commands", "must be a list");
+    else
+      commands.forEach((c, i) => {
+        const { label, to } = c ?? {};
+        if (!isLabel(label)) add(`admin.commands[${i}].label`, "must be a string or { en, th }");
+        if (typeof to !== "string" || !to.startsWith("/") || to.startsWith("//"))
+          add(
+            `admin.commands[${i}].to`,
+            "must be a path in the admin",
+            "e.g. '/collections/orders'"
+          );
+      });
+  }
+  return navIds(navGroups(Array.isArray(nav) ? nav : []));
+}
+function validateGroup(group, ids, path, add) {
+  if (group === void 0 || group === "settings") return;
+  if (typeof group === "string" && group.includes(".") && !ids.has(group)) {
+    add(
+      path,
+      `no menu group "${group}" in admin.nav`,
+      "declare it: nav: [{ id: 'shop', label: 'Shop', children: [{ id: 'catalog', label: 'Catalog' }] }]"
+    );
+    return;
+  }
+  if (!isLabel(group))
+    add(
+      path,
+      `must be a group's id, 'settings' or a label (got ${JSON.stringify(group)})`,
+      "e.g. group: 'shop' or { en: 'Shop', th: '\u0E23\u0E49\u0E32\u0E19\u0E04\u0E49\u0E32' }"
+    );
+}
+function validateLayout(layout, container, path, add) {
+  if (!Array.isArray(layout)) {
+    add(path, "must be a list", "e.g. layout: [{ tab: 'Content', fields: ['title'] }]");
+    return;
+  }
+  const fields = new Map((container.fields ?? []).map((f) => [f.name, f]));
+  const seen = /* @__PURE__ */ new Set();
+  const name = (value, at) => {
+    if (typeof value !== "string" || !fields.has(value)) {
+      add(at, `no top-level field ${JSON.stringify(value)}`);
+      return;
+    }
+    if (fields.get(value)?.position === "sidebar")
+      add(at, `"${value}" is in the sidebar (position: 'sidebar')`);
+    if (seen.has(value)) add(at, `"${value}" is placed twice`);
+    seen.add(value);
+  };
+  const nodes = (list, at, top) => {
+    if (!Array.isArray(list)) {
+      add(at, "must be a list");
+      return;
+    }
+    const tabs = list.filter((n) => typeof n === "object" && n !== null && "tab" in n).length;
+    if (top && tabs > 0 && tabs !== list.length)
+      add(at, "with tabs, every entry at the top is a tab");
+    list.forEach((node, i) => {
+      const p = `${at}[${i}]`;
+      if (typeof node === "string") {
+        name(node, p);
+        return;
+      }
+      const n = node ?? {};
+      if ("tab" in n) {
+        if (!top) add(p, "tabs go at the top of the layout only");
+        if (!isLabel(n.tab)) add(`${p}.tab`, "must be a string or { en, th }");
+        nodes(n.fields, `${p}.fields`, false);
+      } else if ("collapsible" in n) {
+        if (!isLabel(n.collapsible)) add(`${p}.collapsible`, "must be a string or { en, th }");
+        nodes(n.fields, `${p}.fields`, false);
+      } else if ("row" in n) {
+        if (!Array.isArray(n.row) || n.row.length === 0)
+          add(`${p}.row`, "must be a list of field names");
+        else
+          n.row.forEach((f, j) => {
+            name(f, `${p}.row[${j}]`);
+          });
+      } else add(p, "must be a field name, { tab }, { collapsible } or { row }");
+    });
+  };
+  nodes(layout, path, true);
+}
+function validateCollectionAdmin(admin, path, add) {
+  const { badge, count, empty } = admin;
+  if (badge !== void 0) {
+    const b = badge ?? {};
+    if (typeof b.where !== "object" || b.where === null || Array.isArray(b.where))
+      add(`${path}.badge.where`, "must be a where query", "e.g. { status: { equals: 'paid' } }");
+    if (b.tone !== void 0 && !["accent", "warning", "danger"].includes(b.tone))
+      add(`${path}.badge.tone`, "must be 'accent', 'warning' or 'danger'");
+  }
+  if (count !== void 0 && typeof count !== "boolean")
+    add(`${path}.count`, "must be true or false");
+  if (empty !== void 0) {
+    const e = empty ?? {};
+    if (e.description !== void 0 && !isLabel(e.description))
+      add(`${path}.empty.description`, "must be a string or { en, th }");
+    if (e.link !== void 0) {
+      const l = e.link ?? {};
+      if (!isLabel(l.label) || typeof l.href !== "string")
+        add(`${path}.empty.link`, "needs label and href");
+    }
+  }
+}
+function validateContainer(container, path, collectionSlugs, add, { collection: collection2, rbac, nav }) {
   if (!Array.isArray(container.fields)) {
     add(`${path}.fields`, "must be an array");
     return;
@@ -5720,13 +5930,11 @@ function validateContainer(container, path, collectionSlugs, add, { collection:
     } else {
       const sidebar = admin.sidebar;
       if (sidebar !== void 0) validateComponents(sidebar, `${path}.admin.sidebar`, add);
-      const group = admin.group;
-      if (group !== void 0 && group !== "settings" && !(collection2 && typeof group === "string" && group !== "") && !(collection2 && typeof group === "object" && group !== null && Object.values(group).every((v) => typeof v === "string")))
-        add(
-          `${path}.admin.group`,
-          `must be 'settings' or a label (got ${JSON.stringify(group)})`,
-          "e.g. group: { en: 'Shop', th: '\u0E23\u0E49\u0E32\u0E19\u0E04\u0E49\u0E32' }"
-        );
+      validateGroup(admin.group, nav, `${path}.admin.group`, add);
+      const layout = admin.layout;
+      if (layout !== void 0) validateLayout(layout, container, `${path}.admin.layout`, add);
+      if (collection2)
+        validateCollectionAdmin(admin, `${path}.admin`, add);
       const list = admin.list;
       if (list !== void 0) validateList(list, container, `${path}.admin.list`, add);
       const owner = admin.ownerField;
@@ -5818,7 +6026,14 @@ function validateField(field, path, siblings, collectionSlugs, add) {
     if (typeof admin !== "object" || admin === null) {
       add(`${path}.admin`, "must be an object", "e.g. admin: { component: 'ecms-color-picker' }");
     } else {
-      const { component, after, cell } = admin;
+      const { component, after, cell, width, condition, description } = admin;
+      if (width !== void 0 && !["1/4", "1/3", "1/2", "2/3", "3/4", "full"].includes(width))
+        add(`${path}.admin.width`, "must be '1/4', '1/3', '1/2', '2/3', '3/4' or 'full'");
+      if (description !== void 0 && !isLabel(description))
+        add(`${path}.admin.description`, "must be a string or { en, th }");
+      if (condition !== void 0)
+        for (const issue of conditionIssues(condition, [...siblings.keys()]))
+          add(`${path}.admin.condition`, issue);
       if (component !== void 0) validateComponent(component, `${path}.admin.component`, add);
       if (after !== void 0) validateComponents(after, `${path}.admin.after`, add);
       if (cell !== void 0) validateComponent(cell, `${path}.admin.cell`, add);
@@ -6183,7 +6398,9 @@ async function resolveConfig(input) {
       modules: config.admin?.modules ?? [],
       pages: config.admin?.pages ?? [],
       dashboard: config.admin?.dashboard ?? [],
-      switcher: config.admin?.switcher ?? null
+      switcher: config.admin?.switcher ?? null,
+      nav: config.admin?.nav ?? [],
+      commands: config.admin?.commands ?? []
     },
     upload: {
       dir: config.upload?.dir ?? "uploads",
@@ -8825,7 +9042,7 @@ async function readAdminModule(cms, index) {
 }
 
 // src/rest/admin-schema.ts
-var SETTINGS = /* @__PURE__ */ new Set([USERS, API_KEYS]);
+var PEOPLE = /* @__PURE__ */ new Set([USERS, API_KEYS]);
 function componentRef(component) {
   if (typeof component === "string") return { tag: component };
   return component.props ? { tag: component.tag, props: JSON.parse(JSON.stringify(component.props)) } : { tag: component.tag };
@@ -8861,6 +9078,9 @@ async function serializeFields(fields, checks, localized, folderId, who) {
       };
     }
     if (field.customType) f.customType = field.customType;
+    if (field.admin?.description !== void 0) f.description = field.admin.description;
+    if (field.admin?.width) f.width = field.admin.width;
+    if (field.admin?.condition) f.condition = JSON.parse(JSON.stringify(field.admin.condition));
     switch (field.type) {
       case "text":
       case "textarea":
@@ -8967,10 +9187,13 @@ async function collection(cms, config, user, localized, roles, context) {
   if (config.labels) result.labels = config.labels;
   if (config.useAsTitle) result.useAsTitle = config.useAsTitle;
   if (config.icon) result.icon = config.icon;
-  if (config.admin?.sidebar?.length) result.sidebar = config.admin.sidebar.map(componentRef);
-  const group = config.admin?.group;
-  if (group === "settings" || SETTINGS.has(config.slug)) result.group = "settings";
-  else if (group !== void 0) result.section = group;
+  if (config.admin?.sidebar?.length) result.sidebar = config.admin.sidebar.map(panelRef);
+  if (config.admin?.layout?.length) result.layout = layoutOf(config.admin.layout, fields);
+  const badge = config.admin?.badge;
+  if (badge)
+    result.badge = { tone: badge.tone ?? "accent", ...badge.label ? { label: badge.label } : {} };
+  if (config.admin?.count === false) result.noCount = true;
+  if (config.admin?.empty) result.empty = JSON.parse(JSON.stringify(config.admin.empty));
   if (config.admin?.list?.tree) result.tree = config.admin.list.tree;
   if (config.admin?.list?.sort) result.defaultSort = config.admin.list.sort;
   if (config.admin?.confirmDelete) result.confirmDelete = { ...config.admin.confirmDelete };
@@ -9001,7 +9224,8 @@ async function global(cms, config, user, localized, context) {
   };
   if (config.label !== void 0) result.label = config.label;
   if (config.icon) result.icon = config.icon;
-  if (config.admin?.sidebar?.length) result.sidebar = config.admin.sidebar.map(componentRef);
+  if (config.admin?.sidebar?.length) result.sidebar = config.admin.sidebar.map(panelRef);
+  if (config.admin?.layout?.length) result.layout = layoutOf(config.admin.layout, result.fields);
   return result;
 }
 async function adminSchema(cms, user, origin, context = {}) {
@@ -9022,18 +9246,23 @@ async function adminSchema(cms, user, origin, context = {}) {
     audit: cms.audit.enabled && await cms.roles.canView(user, "audit")
   };
   const roles = await cms.roles.options();
+  const adminCollections = await Promise.all(
+    collections.map((c) => collection(cms, c, user, localized, roles, context))
+  );
+  const adminGlobals = await Promise.all(
+    cms.config.globals.map((g) => global(cms, g, user, localized, context))
+  );
+  const adminPages = await pages(cms, user);
   return {
     locale: cms.config.admin.locale,
     switcher: cms.config.admin.switcher,
     passwordLinks: cms.auth.canSendPasswordLinks(origin),
     menu: [...cms.config.admin.menu],
+    nav: buildNav(cms, adminCollections, adminGlobals, adminPages, views),
+    commands: cms.config.admin.commands.map((c) => JSON.parse(JSON.stringify(c))),
     localization: localization ? { locales: [...localization.locales], defaultLocale: localization.defaultLocale } : null,
-    collections: await Promise.all(
-      collections.map((c) => collection(cms, c, user, localized, roles, context))
-    ),
-    globals: await Promise.all(
-      cms.config.globals.map((g) => global(cms, g, user, localized, context))
-    ),
+    collections: adminCollections,
+    globals: adminGlobals,
     modules: adminModuleUrls(cms),
     uploadFromURL: cms.config.upload.fromURL !== void 0,
     upload: {
@@ -9056,7 +9285,7 @@ async function adminSchema(cms, user, origin, context = {}) {
         email: cms.config.collections.some((c) => c.slug === EMAIL_DELIVERIES)
       }
     } : {},
-    pages: await pages(cms, user),
+    pages: adminPages,
     dashboard: await widgets(cms, user)
   };
 }
@@ -9077,7 +9306,6 @@ async function pages(cms, user) {
       path: page.path,
       label: page.label,
       ...page.icon ? { icon: page.icon } : {},
-      group: page.group ?? "content",
       component: componentRef(page.component)
     });
   }
@@ -9096,9 +9324,200 @@ async function widgets(cms, user) {
 function folderIds(cms, user, context) {
   return cms.folders.enabled ? (key2) => cms.keyedFolder(key2, { user, context }) : void 0;
 }
+function panelRef(panel) {
+  const ref = componentRef(panel);
+  if (typeof panel === "object" && "position" in panel && panel.position === "top")
+    ref.position = "top";
+  return ref;
+}
+function layoutOf(layout, fields) {
+  const shown2 = new Set(fields.filter((f) => f.position !== "sidebar").map((f) => f.name));
+  const placed = /* @__PURE__ */ new Set();
+  const convert = (nodes) => nodes.flatMap((node) => {
+    if (typeof node === "string") {
+      if (!shown2.has(node)) return [];
+      placed.add(node);
+      return [{ type: "field", name: node }];
+    }
+    if ("row" in node) {
+      const names2 = node.row.filter((n) => shown2.has(n));
+      for (const n of names2) placed.add(n);
+      return names2.length ? [{ type: "row", fields: names2 }] : [];
+    }
+    if ("collapsible" in node) {
+      const inner2 = convert(node.fields);
+      return inner2.length ? [
+        {
+          type: "collapsible",
+          label: node.collapsible,
+          ...node.collapsed ? { collapsed: true } : {},
+          ...node.description !== void 0 ? { description: node.description } : {},
+          nodes: inner2
+        }
+      ] : [];
+    }
+    const inner = convert(node.fields);
+    return [
+      {
+        type: "tab",
+        label: node.tab,
+        ...node.description !== void 0 ? { description: node.description } : {},
+        nodes: inner
+      }
+    ];
+  });
+  const out = convert(layout);
+  const rest = [...shown2].filter((n) => !placed.has(n)).map((name) => ({ type: "field", name }));
+  const first = out[0];
+  if (first?.type === "tab") first.nodes.push(...rest);
+  else out.push(...rest);
+  return out.filter((n) => n.type !== "tab" || n.nodes.length > 0);
+}
+var VIEW_GROUPS = [
+  ["roles", "settings.people"],
+  ["sso", "settings.people"],
+  ["backups", "settings.system"],
+  ["email", "settings.system"],
+  ["deliveries", "settings.system"],
+  ["audit", "settings.system"]
+];
+function buildNav(cms, collections, globals, pageRefs, views) {
+  const groups = navGroups(cms.config.admin.nav);
+  const ids = navIds(groups);
+  const items = /* @__PURE__ */ new Map();
+  const labelGroups = /* @__PURE__ */ new Map();
+  const put = (group, item) => {
+    if (group.label !== void 0 && !labelGroups.has(group.id))
+      labelGroups.set(group.id, group.label);
+    const list = items.get(group.id) ?? [];
+    list.push(item);
+    items.set(group.id, list);
+  };
+  const configOf = (slug2) => cms.config.collections.find((c) => c.slug === slug2);
+  const menu = cms.config.admin.menu;
+  const rank2 = (slug2, index) => {
+    const at = menu.indexOf(slug2);
+    return at === -1 ? menu.length + index : at;
+  };
+  const ordered = collections.map((c, index) => ({ c, key: rank2(c.slug, index) })).sort((a, b) => a.key - b.key).map(({ c }) => c);
+  let media = false;
+  for (const c of ordered) {
+    if (!c.permissions.read || c.slug === MEDIA_FOLDERS) continue;
+    if (c.slug === MEDIA) {
+      media = true;
+      continue;
+    }
+    const group = PEOPLE.has(c.slug) ? { id: "settings.people" } : groupOf(configOf(c.slug)?.admin?.group, ids, "content");
+    put(group, { kind: "collection", slug: c.slug });
+  }
+  for (const g of globals) {
+    if (!g.permissions.read) continue;
+    const config = cms.config.globals.find((x) => x.slug === g.slug);
+    put(groupOf(config?.admin?.group, ids, "settings.site"), { kind: "global", slug: g.slug });
+  }
+  for (const p of pageRefs) {
+    const config = cms.config.admin.pages.find((x) => x.path === p.path);
+    const group = config?.group ?? "content";
+    if (group === false) continue;
+    put(groupOf(group, ids, "content"), { kind: "page", path: p.path });
+  }
+  for (const [view, group] of VIEW_GROUPS)
+    if (views[view]) put({ id: group }, { kind: "view", view });
+  const toGroup = (g) => {
+    const children = g.children.map(toGroup).filter((c) => c !== null);
+    const own = items.get(g.id) ?? [];
+    if (own.length === 0 && children.length === 0) return null;
+    return {
+      kind: "group",
+      id: g.id,
+      label: g.label,
+      ...g.icon ? { icon: g.icon } : {},
+      items: [...own, ...children]
+    };
+  };
+  const root = [];
+  for (const g of groups) {
+    const node = toGroup(g);
+    if (node) root.push({ order: g.order, node });
+  }
+  let i = 0;
+  for (const [id, label] of labelGroups) {
+    const own = items.get(id) ?? [];
+    if (own.length)
+      root.push({ order: LABEL_ORDER + i++, node: { kind: "group", id, label, items: own } });
+  }
+  if (media) root.push({ order: MEDIA_ORDER, node: { kind: "collection", slug: MEDIA } });
+  return root.sort((a, b) => a.order - b.order).map((r) => r.node);
+}
+
+// src/rest/admin-search.ts
+var listed = (cms) => cms.config.collections.filter(
+  (c) => !INTERNAL_COLLECTIONS.has(c.slug) && c.slug !== MEDIA_FOLDERS
+);
+async function readable(cms, c, who) {
+  try {
+    await cms.count(c.slug, { ...who, overrideAccess: false, where: { id: { exists: false } } });
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function adminCounts(cms, who) {
+  const counts = {};
+  const badges = {};
+  await Promise.all(
+    listed(cms).map(async (c) => {
+      const read2 = { ...who, overrideAccess: false, draft: true };
+      try {
+        if (c.admin?.count !== false) counts[c.slug] = await cms.count(c.slug, read2);
+        if (c.admin?.badge)
+          badges[c.slug] = await cms.count(c.slug, { ...read2, where: c.admin.badge.where });
+      } catch {
+      }
+    })
+  );
+  return { counts, badges };
+}
+async function adminSearch(cms, who, q, perCollection = 5) {
+  const query = q.trim().slice(0, 100);
+  if (query.length < 1) return [];
+  const results = await Promise.all(
+    listed(cms).map(async (c) => {
+      const title = c.useAsTitle ?? (c.fields.some((f) => f.name === "title") ? "title" : void 0);
+      const conditions = [];
+      if (title) conditions.push({ [title]: { like: query } });
+      if (/^\d+$/.test(query)) conditions.push({ id: { equals: Number(query) } });
+      if (conditions.length === 0 || !await readable(cms, c, who)) return [];
+      try {
+        const found = await cms.find(c.slug, {
+          ...who,
+          overrideAccess: false,
+          draft: true,
+          depth: 0,
+          limit: perCollection,
+          where: conditions.length === 1 ? conditions[0] : { or: conditions },
+          sort: "-updatedAt"
+        });
+        return found.docs.map((doc) => {
+          const d = doc;
+          const value = title ? d[title] : void 0;
+          return {
+            collection: c.slug,
+            id: d.id,
+            title: typeof value === "string" && value ? value : `#${String(d.id)}`,
+            ...typeof d.status === "string" ? { status: d.status } : {}
+          };
+        });
+      } catch {
+        return [];
+      }
+    })
+  );
+  return results.flat();
+}
 
 // src/version.ts
-var VERSION = true ? "0.46.0" : "0.0.0-dev";
+var VERSION = true ? "0.47.1" : "0.0.0-dev";
 
 // src/rest/admin-status.ts
 var DAY2 = 864e5;
@@ -9821,6 +10240,18 @@ async function route(cms, ctx, method, segments, options) {
     if (!ctx.user) throw new UnauthorizedError();
     if (second === "schema" && third === void 0)
       return { body: await adminSchema(cms, ctx.user, ctx.url.origin, ctx.context) };
+    if (second === "counts" && third === void 0)
+      return { body: await adminCounts(cms, { user: ctx.user, context: ctx.context }) };
+    if (second === "search" && third === void 0)
+      return {
+        body: {
+          docs: await adminSearch(
+            cms,
+            { user: ctx.user, context: ctx.context },
+            ctx.url.searchParams.get("q") ?? ""
+          )
+        }
+      };
     if (second === "modules" && third !== void 0 && segments.length === 3) {
       const index = /^(\d+)\.js$/.exec(third)?.[1];
       const file = index === void 0 ? void 0 : await readAdminModule(cms, Number(index));
@@ -10667,6 +11098,7 @@ export {
   AuditLog,
   Auth,
   BUILTIN_COLLECTIONS,
+  BUILTIN_NAV,
   CONFIG_FILE_NAMES,
   CSRF_COOKIE,
   CSRF_HEADER,
@@ -10710,6 +11142,7 @@ export {
   applyDefaults,
   applyPlugins,
   checkFormToken,
+  conditionIssues,
   configSignature,
   consoleEmail,
   consoleLogger,
@@ -10740,6 +11173,7 @@ export {
   keyAllows,
   loadConfig,
   localStorage,
+  matchesCondition,
   mergeForUpdate,
   mimeAllowed,
   mimeAllowedBy,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/core",
-  "version": "0.46.0",
+  "version": "0.47.1",
   "description": "Embedded, code-first headless CMS for Nuxt and Next.js",
   "license": "MIT",
   "type": "module",
@@ -14,6 +14,10 @@
       "types": "./dist/live-preview.d.ts",
       "default": "./dist/live-preview.js"
     },
+    "./conditions": {
+      "types": "./dist/conditions.d.ts",
+      "default": "./dist/conditions.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [