@dyrected/core 2.13.4 → 2.13.6

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { F as Field, B as Block, D as DyrectedConfig, C as CollectionConfig, A as AdminAuthConfig, P as PublicAdminAuthConfig, G as GlobalConfig, a as DeclarativeHookExpression, W as WorkflowConfig, b as AuthenticatedUser, c as WorkflowTransition, L as LifecycleEventName, d as LifecycleEvent, e as BaseDocument, H as HookRequestContext, f as DetailComputedOptions, g as ComputedHandler, h as DetailComputed, i as DetailCustomOptions, j as DetailCustom, k as DetailDividerOptions, l as DetailDivider, m as DisplayFieldOptions, n as DetailField, o as DetailItem, p as DetailGridOptions, q as DetailGrid, r as DetailRepeatOptions, s as DetailRepeat, t as DetailSectionOptions, u as DetailSection, v as DetailTabOptions, w as DetailTab, x as DetailTabsOptions, y as DetailTabs, z as DetailTextOptions, E as DetailText, I as DetailSchema, J as DyrectedContext, K as AIConfig, M as AIPIIConfig, N as ArrayField, O as BlocksField, Q as BooleanField, R as AuthConfig, S as AccessPolicyResolver, T as DateField, U as DateTimeField, V as EmailField, X as IconField, Y as ImageField, Z as JoinField, _ as JsonField, $ as MultiSelectField, a0 as NumberField, a1 as ObjectField, a2 as RadioField, a3 as RelationshipField, a4 as RichTextField, a5 as RowField, a6 as SelectField, a7 as TextField, a8 as TextareaField, a9 as TimeField, aa as UrlField } from './app-De-3eNn1.js';
-export { ab as AIAction, ac as AIActionStatus, ad as AIActionType, ae as AIAuditActionType, af as AIAuditRecord, ag as AIChunk, ah as AIMessage, ai as AIPIIPattern, aj as AIRateLimitResult, ak as AIRateLimitStore, al as AIThread, am as AIToolContext, an as AIToolDefinition, ao as AI_ACTIONS_COLLECTION, ap as AI_AUDIT_COLLECTION, aq as AI_CHUNKS_COLLECTION, ar as AI_MESSAGES_COLLECTION, as as AI_THREADS_COLLECTION, at as AccessConfig, au as AccessFunction, av as AccessFunctionArgs, aw as AccessResult, ax as AccessRule, ay as ActionConfig, az as ActionContext, aA as ActionType, aB as AdminAuthAccessResolution, aC as AdminAuthClaimMapping, aD as AdminAuthMember, aE as AdminAuthProvider, aF as AdminAuthProviderMembersConfig, aG as AdminAuthProvisioningMode, aH as AdminAuthResolveAccessArgs, aI as AdminAuthResolvedIdentity, aJ as AdminConfig, aK as AdminDashboardComponentSlots, aL as AdminIconName, aM as AggregateArgs, aN as AggregateCastType, aO as AggregateCollectionResult, aP as AggregateInput, aQ as AggregateOperation, aR as AggregateResult, aS as BaseAdminAuthProvider, aT as BaseFieldAdmin, aU as BlockVariant, aV as BooleanFieldAdmin, aW as BooleanFormat, aX as CharacterLimitFieldAdmin, aY as CharacterLimitFieldConfig, aZ as CollectionAfterChangeHook, a_ as CollectionAfterDeleteHook, a$ as CollectionAfterReadHook, b0 as CollectionAfterReadHookEntry, b1 as CollectionAfterTransitionHook, b2 as CollectionBeforeChangeHook, b3 as CollectionBeforeChangeHookEntry, b4 as CollectionBeforeDeleteHook, b5 as CollectionBeforeReadHook, b6 as CollectionBeforeReadHookEntry, b7 as CollectionBeforeTransitionHook, b8 as CollectionListComponentSlots, b9 as CollectionRAGConfig, ba as CollectionSchemaResult, bb as CollectionSummaryResult, bc as CollectionViewComponentSlots, bd as CountOperation, be as CustomAdminAuthProvider, bf as DatabaseAdapter, bg as DateFieldAdmin, bh as DateFormat, bi as DefineActionOptions, bj as DefineViewOptions, bk as DetailSpan, bl as DisplayTone, bm as DisplayVariant, bn as DistinctCountOperation, bo as DistinctValuesOperation, bp as DynamicOptionItem, bq as DynamicOptionsConfig, br as DynamicOptionsResolver, bs as DynamicOptionsResolverArgs, bt as DyrectedAIContext, bu as DyrectedLoggerConfig, bv as DyrectedObservabilityConfig, bw as EmailFieldAdmin, bx as FieldAdminHooks, by as FieldAdminOnChangeHook, bz as FieldAdminOnChangeHookArgs, bA as FieldAdminOptionsHook, bB as FieldAdminOptionsHookArgs, bC as FieldAdminOptionsHookResult, bD as FieldAfterReadHook, bE as FieldAfterReadHookArgs, bF as FieldBase, bG as FieldBeforeChangeHook, bH as FieldBeforeChangeHookArgs, bI as FieldHook, bJ as FieldHooks, bK as FieldType, bL as FileData, bM as GetDocumentResult, bN as GlobalAfterChangeHook, bO as GlobalAfterReadHook, bP as GlobalAfterReadHookEntry, bQ as GlobalBeforeChangeHook, bR as GlobalBeforeChangeHookEntry, bS as GlobalBeforeReadHook, bT as GlobalBeforeReadHookEntry, bU as GlobalRAGConfig, bV as GlobalSchemaResult, bW as GlobalSummaryResult, bX as HeadingLevel, bY as HookFunction, bZ as IconFieldAdmin, b_ as ImageService, b$ as ImageTransformOptions, c0 as InferAggregateResult, c1 as JoinFieldAdmin, c2 as JsonFieldAdmin, c3 as JsonFormat, c4 as LIFECYCLE_EVENT_NAMES, c5 as LifecycleEventHandler, c6 as LinkFormat, c7 as MetricColor, c8 as MultiSelectFieldAdmin, c9 as NamedAccessPolicy, ca as NumberFieldAdmin, cb as NumberFormat, cc as NumberLimitFieldAdmin, cd as NumberLimitFieldConfig, ce as NumericOperation, cf as OIDCAdminAuthProvider, cg as OptionFormat, ch as PaginatedResult, ci as PublicAdminAuthProvider, cj as QueryCollectionResult, ck as RAGSearchResult, cl as RadioFieldAdmin, cm as RateLimitConfig, cn as ReadonlyDatabaseAdapter, co as RichTextFeature, cp as RichTextFieldConfig, cq as SelectFieldAdmin, cr as SqlWhereResult, cs as StorageAdapter, ct as TextFieldAdmin, cu as TextFormat, cv as TextareaFieldAdmin, cw as TrustProxyConfig, cx as TypedField, cy as UploadConfig, cz as UrlFieldAdmin, cA as UrlLinkValue, cB as ViewActionFeatures, cC as ViewComponentSlots, cD as ViewConfig, cE as ViewLayout, cF as ViewMetric, cG as ViewSubMetric, cH as WhereClause, cI as WhereOperator, cJ as WhereOperatorName, cK as WordLimitFieldAdmin, cL as WordLimitFieldConfig, cM as WorkflowMetadata, cN as WorkflowRole, cO as WorkflowState, cP as WorkflowTransitionContext, cQ as defineAction, cR as defineView, cS as isAICollection, cT as parseMongoWhere, cU as parseSqlWhere } from './app-De-3eNn1.js';
+import { F as Field, B as Block, C as CollectionConfig, D as DyrectedConfig, A as AdminAuthConfig, P as PublicAdminAuthConfig, G as GlobalConfig, a as DeclarativeHookExpression, W as WorkflowConfig, b as AuthenticatedUser, c as WorkflowTransition, L as LifecycleEventName, d as LifecycleEvent, e as BaseDocument, H as HookRequestContext, f as DetailComputedOptions, g as ComputedHandler, h as DetailComputed, i as DetailCustomOptions, j as DetailCustom, k as DetailDividerOptions, l as DetailDivider, m as DisplayFieldOptions, n as DetailField, o as DetailItem, p as DetailGridOptions, q as DetailGrid, r as DetailRepeatOptions, s as DetailRepeat, t as DetailSectionOptions, u as DetailSection, v as DetailTabOptions, w as DetailTab, x as DetailTabsOptions, y as DetailTabs, z as DetailTextOptions, E as DetailText, I as DetailSchema, J as DyrectedContext, K as AIConfig, M as AIPIIConfig, N as ArrayField, O as FieldType, Q as BooleanField, R as AuthConfig, S as AccessPolicyResolver, T as DateField, U as DateTimeField, V as EmailField, X as IconField, Y as ImageField, Z as JoinField, _ as JsonField, $ as MultiSelectField, a0 as NumberField, a1 as ObjectField, a2 as RadioField, a3 as RelationshipField, a4 as RichTextField, a5 as RowField, a6 as SelectField, a7 as TextField, a8 as TextareaField, a9 as TimeField, aa as UrlField } from './app-phLVsEOM.js';
+export { ab as AIAction, ac as AIActionStatus, ad as AIActionType, ae as AIAuditActionType, af as AIAuditRecord, ag as AIChunk, ah as AIMessage, ai as AIPIIPattern, aj as AIRateLimitResult, ak as AIRateLimitStore, al as AIThread, am as AIToolContext, an as AIToolDefinition, ao as AI_ACTIONS_COLLECTION, ap as AI_AUDIT_COLLECTION, aq as AI_CHUNKS_COLLECTION, ar as AI_MESSAGES_COLLECTION, as as AI_THREADS_COLLECTION, at as AccessConfig, au as AccessFunction, av as AccessFunctionArgs, aw as AccessResult, ax as AccessRule, ay as ActionConfig, az as ActionConfigBase, aA as ActionConfigWithHandler, aB as ActionConfigWithMutation, aC as ActionContext, aD as ActionType, aE as AdminAuthAccessResolution, aF as AdminAuthClaimMapping, aG as AdminAuthMember, aH as AdminAuthProvider, aI as AdminAuthProviderMembersConfig, aJ as AdminAuthProvisioningMode, aK as AdminAuthResolveAccessArgs, aL as AdminAuthResolvedIdentity, aM as AdminConfig, aN as AdminDashboardComponentSlots, aO as AdminIconName, aP as AggregateArgs, aQ as AggregateCastType, aR as AggregateCollectionResult, aS as AggregateInput, aT as AggregateOperation, aU as AggregateResult, aV as BaseAdminAuthProvider, aW as BaseFieldAdmin, aX as BlockVariant, aY as BlocksField, aZ as BooleanFieldAdmin, a_ as BooleanFormat, a$ as CharacterLimitFieldAdmin, b0 as CharacterLimitFieldConfig, b1 as CollectionAfterChangeHook, b2 as CollectionAfterDeleteHook, b3 as CollectionAfterReadHook, b4 as CollectionAfterReadHookEntry, b5 as CollectionAfterTransitionHook, b6 as CollectionBeforeChangeHook, b7 as CollectionBeforeChangeHookEntry, b8 as CollectionBeforeDeleteHook, b9 as CollectionBeforeReadHook, ba as CollectionBeforeReadHookEntry, bb as CollectionBeforeTransitionHook, bc as CollectionListComponentSlots, bd as CollectionRAGConfig, be as CollectionSchemaResult, bf as CollectionSummaryResult, bg as CollectionViewComponentSlots, bh as CountOperation, bi as CustomAdminAuthProvider, bj as DatabaseAdapter, bk as DateFieldAdmin, bl as DateFormat, bm as DefaultValueContext, bn as DefineActionOptions, bo as DefineCalendarViewOptions, bp as DefineCardsViewOptions, bq as DefineGanttViewOptions, br as DefineKanbanViewOptions, bs as DefineTableViewOptions, bt as DefineViewBaseOptions, bu as DefineViewOptions, bv as DetailSpan, bw as DisplayTone, bx as DisplayVariant, by as DistinctCountOperation, bz as DistinctValuesOperation, bA as DynamicOptionItem, bB as DynamicOptionsConfig, bC as DynamicOptionsResolver, bD as DynamicOptionsResolverArgs, bE as DyrectedAIContext, bF as DyrectedLoggerConfig, bG as DyrectedObservabilityConfig, bH as EmailFieldAdmin, bI as FieldAdminHooks, bJ as FieldAdminOnChangeHook, bK as FieldAdminOnChangeHookArgs, bL as FieldAdminOptionsHook, bM as FieldAdminOptionsHookArgs, bN as FieldAdminOptionsHookResult, bO as FieldAfterReadHook, bP as FieldAfterReadHookArgs, bQ as FieldBase, bR as FieldBeforeChangeHook, bS as FieldBeforeChangeHookArgs, bT as FieldHook, bU as FieldHooks, bV as FileData, bW as GetDocumentResult, bX as GlobalAfterChangeHook, bY as GlobalAfterReadHook, bZ as GlobalAfterReadHookEntry, b_ as GlobalBeforeChangeHook, b$ as GlobalBeforeChangeHookEntry, c0 as GlobalBeforeReadHook, c1 as GlobalBeforeReadHookEntry, c2 as GlobalRAGConfig, c3 as GlobalSchemaResult, c4 as GlobalSummaryResult, c5 as HeadingLevel, c6 as HookFunction, c7 as IconFieldAdmin, c8 as ImageService, c9 as ImageTransformOptions, ca as InferAggregateResult, cb as JoinFieldAdmin, cc as JsonFieldAdmin, cd as JsonFormat, ce as LIFECYCLE_EVENT_NAMES, cf as LifecycleEventHandler, cg as LinkFormat, ch as MetricColor, ci as MultiSelectFieldAdmin, cj as NamedAccessPolicy, ck as NumberFieldAdmin, cl as NumberFormat, cm as NumberLimitFieldAdmin, cn as NumberLimitFieldConfig, co as NumericOperation, cp as OIDCAdminAuthProvider, cq as OptionFormat, cr as PaginatedResult, cs as PublicAdminAuthProvider, ct as QueryCollectionResult, cu as RAGSearchResult, cv as RadioFieldAdmin, cw as RateLimitConfig, cx as ReadonlyDatabaseAdapter, cy as RichTextFeature, cz as RichTextFieldConfig, cA as SelectFieldAdmin, cB as SqlWhereResult, cC as StorageAdapter, cD as TextFieldAdmin, cE as TextFormat, cF as TextareaFieldAdmin, cG as TrustProxyConfig, cH as TypedField, cI as UploadConfig, cJ as UrlFieldAdmin, cK as UrlLinkValue, cL as ViewActionFeatures, cM as ViewComponentSlots, cN as ViewConfig, cO as ViewLayout, cP as ViewMetric, cQ as ViewSubMetric, cR as WhereClause, cS as WhereOperator, cT as WhereOperatorName, cU as WordLimitFieldAdmin, cV as WordLimitFieldConfig, cW as WorkflowMetadata, cX as WorkflowRole, cY as WorkflowState, cZ as WorkflowTransitionContext, c_ as defineAction, c$ as defineCalendarView, d0 as defineCardsView, d1 as defineGanttView, d2 as defineKanbanView, d3 as defineTableView, d4 as defineView, d5 as isAICollection, d6 as parseMongoWhere, d7 as parseSqlWhere } from './app-phLVsEOM.js';
 import jexl from 'jexl';
 import { Context } from 'hono';
 export { z } from 'zod';
@@ -96,6 +96,43 @@ declare class DyrectedAIError extends Error {
     };
 }
 
+/**
+ * Helper to work around TypeScript readonly inference issues with `const` collection definitions.
+ *
+ * When using `const Collection = defineCollection({...})`, TypeScript may infer all properties
+ * as readonly, which can cause type compatibility issues with the schema type system in complex
+ * nested field scenarios. This is a known TypeScript limitation with deep readonly inference.
+ *
+ * **Note**: The collection works perfectly at runtime. This is purely a type-checking limitation.
+ *
+ * Use this helper or `satisfies` when you hit type errors:
+ *
+ * Option 1: Wrap with asCollection (automatic in defineCollection):
+ * ```ts
+ * const Pages = asCollection(defineCollection({
+ *   slug: "pages",
+ *   fields: [...]
+ * }))
+ * ```
+ *
+ * Option 2: Use `satisfies` pattern:
+ * ```ts
+ * const Pages = {
+ *   slug: "pages",
+ *   fields: [...]
+ * } satisfies CollectionConfig
+ * ```
+ *
+ * Option 3: Use // @ts-expect-error for readonly inference only:
+ * ```ts
+ * // @ts-expect-error TypeScript readonly inference limitation with deeply nested fields
+ * const Pages = defineCollection({...})
+ * ```
+ *
+ * The collection functions and APIs work correctly despite the type error.
+ */
+declare function asCollection<T extends CollectionConfig<any>>(config: T): T;
+
 /**
  * Normalizes the Dyrected configuration by injecting system fields
  * (createdAt, updatedAt, createdBy, updatedBy) into every collection and
@@ -1311,24 +1348,27 @@ type TypedBlockForConfig<TBlock extends Block, TCollections extends readonly unk
 type TypedBlocksForConfig<TBlocks extends readonly Block[], TCollections extends readonly unknown[], TRootBlocks extends readonly Block[], TPolicyNames extends string> = {
     [K in keyof TBlocks]: TBlocks[K] extends Block ? TypedBlockForConfig<TBlocks[K], TCollections, TRootBlocks, TPolicyNames> : TBlocks[K];
 };
+type MutableOmit<T, K extends PropertyKey> = {
+    [P in keyof T as P extends K ? never : P]: T[P];
+};
 type TypedFieldForConfig<TField extends Field, TCollections extends readonly unknown[], TBlocks extends readonly Block[], TPolicyNames extends string> = TField extends {
     type: "relationship";
-} ? Omit<TField, "relationTo" | "access"> & {
+} ? MutableOmit<TField, "relationTo" | "access"> & {
     relationTo?: TypedReference<PropertyType<TField, "relationTo">, CollectionSlug<TCollections>, "collection slug">;
     access?: TypedFieldAccess<NonNullable<TField["access"]>, TPolicyNames>;
 } : TField extends {
     type: "image";
-} ? Omit<TField, "relationTo" | "access"> & {
+} ? MutableOmit<TField, "relationTo" | "access"> & {
     relationTo?: TypedReference<PropertyType<TField, "relationTo">, UploadCollectionSlug<TCollections>, "upload collection slug">;
     access?: TypedFieldAccess<NonNullable<TField["access"]>, TPolicyNames>;
 } : TField extends {
     type: "richText";
-} ? Omit<TField, "uploadCollection" | "access"> & {
+} ? MutableOmit<TField, "uploadCollection" | "access"> & {
     uploadCollection?: TypedReference<PropertyType<TField, "uploadCollection">, UploadCollectionSlug<TCollections>, "upload collection slug">;
     access?: TypedFieldAccess<NonNullable<TField["access"]>, TPolicyNames>;
 } : TField extends {
     type: "join";
-} ? Omit<TField, "collection" | "on" | "access"> & {
+} ? MutableOmit<TField, "collection" | "on" | "access"> & {
     collection?: TypedReference<PropertyType<TField, "collection">, CollectionSlug<TCollections>, "collection slug">;
     on?: TypedReference<PropertyType<TField, "on">, CollectionFieldNamesBySlug<TCollections, Extract<PropertyType<TField, "collection">, string>> | TopLevelFieldName<Extract<CollectionBySlug<TCollections, CollectionSlug<TCollections>>, {
         fields: readonly Field[];
@@ -1336,30 +1376,30 @@ type TypedFieldForConfig<TField extends Field, TCollections extends readonly unk
     access?: TypedFieldAccess<NonNullable<TField["access"]>, TPolicyNames>;
 } : TField extends {
     type: "blocks";
-} ? Omit<TField, "blocks" | "blockReferences" | "access"> & {
+} ? MutableOmit<TField, "blocks" | "blockReferences" | "access"> & {
     blocks?: TField["blocks"] extends readonly Block[] ? TypedBlocksForConfig<TField["blocks"], TCollections, TBlocks, TPolicyNames> : TField["blocks"];
     blockReferences?: TypedReferenceList<PropertyType<TField, "blockReferences">, BlockSlug<TBlocks>, "block slug">;
     access?: TypedFieldAccess<NonNullable<TField["access"]>, TPolicyNames>;
 } : TField extends {
     type: "array";
     fields: infer TSubFields extends readonly Field[];
-} ? Omit<TField, "fields" | "access" | "admin"> & {
+} ? MutableOmit<TField, "fields" | "access" | "admin"> & {
     fields: TypedFields<TSubFields, TCollections, TBlocks, TPolicyNames>;
     access?: TypedFieldAccess<NonNullable<TField["access"]>, TPolicyNames>;
     admin?: TypedNestedFieldAdmin<TSubFields, PropertyType<TField, "admin">>;
 } : TField extends {
     type: "object";
     fields: infer TSubFields extends readonly Field[];
-} ? Omit<TField, "fields" | "access" | "admin"> & {
+} ? MutableOmit<TField, "fields" | "access" | "admin"> & {
     fields: TypedFields<TSubFields, TCollections, TBlocks, TPolicyNames>;
     access?: TypedFieldAccess<NonNullable<TField["access"]>, TPolicyNames>;
     admin?: TypedNestedFieldAdmin<TSubFields, PropertyType<TField, "admin">>;
 } : TField extends {
     fields: infer TSubFields extends readonly Field[];
-} ? Omit<TField, "fields" | "access"> & {
+} ? MutableOmit<TField, "fields" | "access"> & {
     fields: TypedFields<TSubFields, TCollections, TBlocks, TPolicyNames>;
     access?: TypedFieldAccess<NonNullable<TField["access"]>, TPolicyNames>;
-} : Omit<TField, "access"> & {
+} : MutableOmit<TField, "access"> & {
     access?: TypedFieldAccess<NonNullable<TField["access"]>, TPolicyNames>;
 };
 type TypedFields<TFields extends readonly Field[], TCollections extends readonly unknown[], TBlocks extends readonly Block[], TPolicyNames extends string> = {
@@ -1527,6 +1567,10 @@ declare function defineField<const T extends Field>(field: T): T;
  * ```
  */
 declare function defineBlock<const T extends Block>(block: T): T;
+/** The member of the {@link Field} union that has the given `type`. */
+type FieldOfType<TType extends FieldType> = Extract<Field, {
+    type: TType;
+}>;
 /** Define a `text` field. */
 declare const defineTextField: <const T extends Omit<TextField, "type">>(field: T) => T & {
     type: "text";
@@ -1571,10 +1615,6 @@ declare const defineMultiSelectField: <const T extends Omit<MultiSelectField, "t
 declare const defineRadioField: <const T extends Omit<RadioField, "type">>(field: T) => T & {
     type: "radio";
 };
-/** Define a `relationship` field. */
-declare const defineRelationshipField: <const T extends Omit<RelationshipField, "type">>(field: T) => T & {
-    type: "relationship";
-};
 /** Define an `array` field. */
 declare const defineArrayField: <const T extends Omit<ArrayField, "type">>(field: T) => T & {
     type: "array";
@@ -1588,13 +1628,9 @@ declare const defineJsonField: <const T extends Omit<JsonField, "type">>(field:
     type: "json";
 };
 /** Define a `blocks` field. */
-declare const defineBlocksField: <const T extends Omit<BlocksField, "type">>(field: T) => T & {
+declare const defineBlocksField: <const T extends Omit<FieldOfType<"blocks">, "type">>(field: T) => T & {
     type: "blocks";
 };
-/** Define an `image` field. */
-declare const defineImageField: <const T extends Omit<ImageField, "type">>(field: T) => T & {
-    type: "image";
-};
 /** Define an `email` field. */
 declare const defineEmailField: <const T extends Omit<EmailField, "type">>(field: T) => T & {
     type: "email";
@@ -1607,14 +1643,92 @@ declare const defineUrlField: <const T extends Omit<UrlField, "type">>(field: T)
 declare const defineIconField: <const T extends Omit<IconField, "type">>(field: T) => T & {
     type: "icon";
 };
-/** Define a `join` field. */
-declare const defineJoinField: <const T extends Omit<JoinField, "type">>(field: T) => T & {
-    type: "join";
-};
 /** Define a layout-only `row` field. */
 declare const defineRowField: <const T extends Omit<RowField, "type">>(field: T) => T & {
     type: "row";
 };
+/**
+ * Extract valid collection slugs from a collection config array.
+ * Used to type-safe `relationTo` and `collection` field properties.
+ * @example
+ * ```ts
+ * type ValidSlugs = ExtractCollectionSlugs<typeof collections>;
+ * // ValidSlugs = "posts" | "comments" | "users"
+ * ```
+ */
+type ExtractCollectionSlugs<TCollections extends readonly CollectionConfig<any>[]> = Extract<TCollections[number], {
+    slug: string;
+}>["slug"];
+/** Base relationship field definer (internal). */
+declare const _defineRelationshipFieldBase: <const T extends Omit<RelationshipField, "type">>(field: T) => T & {
+    type: "relationship";
+};
+/** Base image field definer (internal). */
+declare const _defineImageFieldBase: <const T extends Omit<ImageField, "type">>(field: T) => T & {
+    type: "image";
+};
+/** Base join field definer (internal). */
+declare const _defineJoinFieldBase: <const T extends Omit<JoinField, "type">>(field: T) => T & {
+    type: "join";
+};
+/**
+ * Define a `relationship` field with automatic slug inference from your collection config.
+ * The `relationTo` parameter is type-checked at compile time against available collections.
+ *
+ * @example
+ * ```ts
+ * import { dyrectedSchema } from './schema';
+ * type ValidSlugs = ExtractCollectionSlugs<typeof dyrectedSchema.collections>;
+ *
+ * defineRelationshipField<ValidSlugs>({
+ *   name: 'author',
+ *   relationTo: 'users',  // ✅ TypeScript validates against your collections
+ * })
+ * ```
+ */
+declare function defineRelationshipField<TValidSlugs extends string = string>(config: Omit<Omit<Parameters<typeof _defineRelationshipFieldBase>[0], "type">, "relationTo"> & {
+    relationTo: TValidSlugs;
+}): RelationshipField;
+declare function defineRelationshipField(config: Parameters<typeof _defineRelationshipFieldBase>[0]): RelationshipField;
+/**
+ * Define an `image` field with automatic slug inference from your collection config.
+ * The `relationTo` parameter is type-checked at compile time against available collections.
+ *
+ * @example
+ * ```ts
+ * import { dyrectedSchema } from './schema';
+ * type ValidSlugs = ExtractCollectionSlugs<typeof dyrectedSchema.collections>;
+ *
+ * defineImageField<ValidSlugs>({
+ *   name: 'cover',
+ *   relationTo: 'media',  // ✅ TypeScript validates against your collections
+ * })
+ * ```
+ */
+declare function defineImageField<TValidSlugs extends string = string>(config: Omit<Omit<Parameters<typeof _defineImageFieldBase>[0], "type">, "relationTo"> & {
+    relationTo: TValidSlugs;
+}): ImageField;
+declare function defineImageField(config: Parameters<typeof _defineImageFieldBase>[0]): ImageField;
+/**
+ * Define a `join` field with automatic slug inference from your collection config.
+ * The `collection` parameter is type-checked at compile time against available collections.
+ *
+ * @example
+ * ```ts
+ * import { dyrectedSchema } from './schema';
+ * type ValidSlugs = ExtractCollectionSlugs<typeof dyrectedSchema.collections>;
+ *
+ * defineJoinField<ValidSlugs>({
+ *   name: 'post_comments',
+ *   collection: 'posts',  // ✅ TypeScript validates against your collections
+ *   on: 'comments',
+ * })
+ * ```
+ */
+declare function defineJoinField<TValidSlugs extends string = string>(config: Omit<Omit<Parameters<typeof _defineJoinFieldBase>[0], "type">, "collection"> & {
+    collection: TValidSlugs;
+}): JoinField;
+declare function defineJoinField(config: Parameters<typeof _defineJoinFieldBase>[0]): JoinField;
 /**
  * Group fields under a named tab in the Admin edit form. Tabs are presentational
  * only: `defineTab` returns the given fields unchanged except that each one's
@@ -1649,4 +1763,4 @@ declare function defineTab<const T extends readonly Field[]>(args: {
     fields: T;
 }): T;
 
-export { AIConfig, type AIErrorCode, AIPIIConfig, type AccessConditions, AccessPolicyResolver, AdminAuthConfig, ArrayField, AuthConfig, type AuthDocFields, AuthenticatedUser, BUILTIN_JEXL_HELPERS, BaseDocument, Block, BlocksField, BooleanField, CollectionConfig, ComputedHandler, type ConfigDiagnostic, ConfigValidationError, DateField, DateTimeField, type DeclarativeAccessSurface, type DeclarativeAccessValidationIssue, type DeclarativeAdminSurface, type DeclarativeAdminValidationIssue, DeclarativeHookExpression, type DeclarativeHookSurface, type DeclarativeHookValidationIssue, type DeclarativePreviewSurface, type DeclarativePreviewValidationIssue, DetailComputed, DetailComputedOptions, DetailCustom, DetailCustomOptions, DetailDivider, DetailDividerOptions, DetailField, DetailGrid, DetailGridOptions, DetailItem, DetailRepeat, DetailRepeatOptions, DetailSchema, DetailSection, DetailSectionOptions, DetailTab, DetailTabOptions, DetailTabs, DetailTabsOptions, DetailText, DetailTextOptions, DisplayFieldOptions, DyrectedAIError, DyrectedConfig, EmailField, type ExprFunction, Field, FieldConditionBuilder, GlobalConfig, HookRequestContext, IconField, ImageField, type InferDocShape, JoinField, JsonField, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, MatchBuilder, MultiSelectField, NON_NEGOTIABLE_CREDENTIAL_FIELDS, NumberField, ObjectField, PII_REGEX_PATTERNS, type Prettify, PublicAdminAuthConfig, type PublishingWorkflowOptions, RadioField, RelationshipField, RichTextField, RowField, type SanitizeDocForAIOptions, SelectField, type SortClause, type SortDirection, type SqlSortDialect, type SystemDocFields, TextField, TextareaField, TimeField, type UploadDocFields, UrlField, WORKFLOW_HISTORY_COLLECTION, type WhenFunction, WorkflowConfig, WorkflowTransition, abs, addDays, assertValidAdminConditionsInConfig, assertValidDeclarativeAccessInConfig, assertValidDeclarativeHookExpression, assertValidDeclarativeHookResult, assertValidDeclarativeHooksInConfig, assertValidPreviewUrlsInConfig, availableWorkflowTransitions, buildSqlOrderBy, canViewWorkflowDraft, capitalize, ceil, clamp, coalesce, collectAdminConditionValidationIssues, collectConfigDiagnostics, collectDeclarativeAccessValidationIssues, collectDeclarativeHookValidationIssues, collectPreviewUrlValidationIssues, compact, count, createLifecycleEvent, createWorkflowDocument, defaultValue, defineArrayField, defineBlock, defineBlocksField, defineBooleanField, defineCollection, defineConfig, defineDateField, defineDateTimeField, defineEmailField, defineField, defineGlobal, defineIconField, defineImageField, defineJoinField, defineJsonField, defineMultiSelectField, defineNumberField, defineObjectField, definePublishingWorkflow, defineRadioField, defineRelationshipField, defineRichTextField, defineRowField, defineSelectField, defineTab, defineTextField, defineTextareaField, defineTimeField, defineUrlField, diffDays, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, displayComputed, displayCustom, displayCustomComponent, displayDivider, displayField, displayGrid, displayRepeat, displaySection, displayTab, displayTabs, displayText, endsWith, evaluateDetailComputed, evaluateJexl, evaluateJexlSync, executeFieldAfterRead, executeFieldBeforeChange, expr, first, floor, formatConfigDiagnostics, formatDate, formatJexlValue, generateDefaultDetailSchema, generateOpenApi, get, getAdminAuthCollection, getAdminRoleForCollection, getAllowedSitesForUser, getPublicAdminAuthConfig, includes, initializeWorkflowDocument, isConfigValidationError, isDetailItemVisible, isEmpty, isFuture, isPast, isSiteAuthorized, isUserAdmin, join, last, length, lower, maskEmail, maskPhone, maskTextPII, materializeWorkflowDocument, max, min, normalizeConfig, normalizeDetailItem, now, numericFieldNames, parseSort, pow, publishedStateName, publishingWorkflow, readingTime, registerJexlHelpers, replace, resolveAdminAuthCollection, resolveAuthorizedSiteId, round, runCollectionHooks, sanitizeDocForAI, saveWorkflowDraft, simplePublishingWorkflow, slugify, sqrt, startsWith, sum, today, transitionWorkflow, trim, truncate, unique, upper, validateAdminConditionExpression, validateDeclarativeAccessExpression, validateDeclarativeHookExpression, validatePreviewUrlExpression, when, wordCount, workflowCapabilities };
+export { AIConfig, type AIErrorCode, AIPIIConfig, type AccessConditions, AccessPolicyResolver, AdminAuthConfig, ArrayField, AuthConfig, type AuthDocFields, AuthenticatedUser, BUILTIN_JEXL_HELPERS, BaseDocument, Block, BooleanField, CollectionConfig, ComputedHandler, type ConfigDiagnostic, ConfigValidationError, DateField, DateTimeField, type DeclarativeAccessSurface, type DeclarativeAccessValidationIssue, type DeclarativeAdminSurface, type DeclarativeAdminValidationIssue, DeclarativeHookExpression, type DeclarativeHookSurface, type DeclarativeHookValidationIssue, type DeclarativePreviewSurface, type DeclarativePreviewValidationIssue, DetailComputed, DetailComputedOptions, DetailCustom, DetailCustomOptions, DetailDivider, DetailDividerOptions, DetailField, DetailGrid, DetailGridOptions, DetailItem, DetailRepeat, DetailRepeatOptions, DetailSchema, DetailSection, DetailSectionOptions, DetailTab, DetailTabOptions, DetailTabs, DetailTabsOptions, DetailText, DetailTextOptions, DisplayFieldOptions, DyrectedAIError, DyrectedConfig, EmailField, type ExprFunction, type ExtractCollectionSlugs, Field, FieldConditionBuilder, FieldType, GlobalConfig, HookRequestContext, IconField, ImageField, type InferDocShape, JoinField, JsonField, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, MatchBuilder, MultiSelectField, NON_NEGOTIABLE_CREDENTIAL_FIELDS, NumberField, ObjectField, PII_REGEX_PATTERNS, type Prettify, PublicAdminAuthConfig, type PublishingWorkflowOptions, RadioField, RelationshipField, RichTextField, RowField, type SanitizeDocForAIOptions, SelectField, type SortClause, type SortDirection, type SqlSortDialect, type SystemDocFields, TextField, TextareaField, TimeField, type UploadDocFields, UrlField, WORKFLOW_HISTORY_COLLECTION, type WhenFunction, WorkflowConfig, WorkflowTransition, abs, addDays, asCollection, assertValidAdminConditionsInConfig, assertValidDeclarativeAccessInConfig, assertValidDeclarativeHookExpression, assertValidDeclarativeHookResult, assertValidDeclarativeHooksInConfig, assertValidPreviewUrlsInConfig, availableWorkflowTransitions, buildSqlOrderBy, canViewWorkflowDraft, capitalize, ceil, clamp, coalesce, collectAdminConditionValidationIssues, collectConfigDiagnostics, collectDeclarativeAccessValidationIssues, collectDeclarativeHookValidationIssues, collectPreviewUrlValidationIssues, compact, count, createLifecycleEvent, createWorkflowDocument, defaultValue, defineArrayField, defineBlock, defineBlocksField, defineBooleanField, defineCollection, defineConfig, defineDateField, defineDateTimeField, defineEmailField, defineField, defineGlobal, defineIconField, defineImageField, defineJoinField, defineJsonField, defineMultiSelectField, defineNumberField, defineObjectField, definePublishingWorkflow, defineRadioField, defineRelationshipField, defineRichTextField, defineRowField, defineSelectField, defineTab, defineTextField, defineTextareaField, defineTimeField, defineUrlField, diffDays, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, displayComputed, displayCustom, displayCustomComponent, displayDivider, displayField, displayGrid, displayRepeat, displaySection, displayTab, displayTabs, displayText, endsWith, evaluateDetailComputed, evaluateJexl, evaluateJexlSync, executeFieldAfterRead, executeFieldBeforeChange, expr, first, floor, formatConfigDiagnostics, formatDate, formatJexlValue, generateDefaultDetailSchema, generateOpenApi, get, getAdminAuthCollection, getAdminRoleForCollection, getAllowedSitesForUser, getPublicAdminAuthConfig, includes, initializeWorkflowDocument, isConfigValidationError, isDetailItemVisible, isEmpty, isFuture, isPast, isSiteAuthorized, isUserAdmin, join, last, length, lower, maskEmail, maskPhone, maskTextPII, materializeWorkflowDocument, max, min, normalizeConfig, normalizeDetailItem, now, numericFieldNames, parseSort, pow, publishedStateName, publishingWorkflow, readingTime, registerJexlHelpers, replace, resolveAdminAuthCollection, resolveAuthorizedSiteId, round, runCollectionHooks, sanitizeDocForAI, saveWorkflowDraft, simplePublishingWorkflow, slugify, sqrt, startsWith, sum, today, transitionWorkflow, trim, truncate, unique, upper, validateAdminConditionExpression, validateDeclarativeAccessExpression, validateDeclarativeHookExpression, validatePreviewUrlExpression, when, wordCount, workflowCapabilities };

package/dist/index.js

@@ -1775,6 +1775,11 @@ var require_Jexl = __commonJS({
   }
 });
 
+// src/types/readonly-fix.ts
+function asCollection(config) {
+  return config;
+}
+
 // src/types/workflows.ts
 var LIFECYCLE_EVENT_NAMES = [
   "revision.created",
@@ -1787,6 +1792,21 @@ var LIFECYCLE_EVENT_NAMES = [
 function defineView(config) {
   return config;
 }
+function defineTableView(config) {
+  return config;
+}
+function defineKanbanView(config) {
+  return config;
+}
+function defineCalendarView(config) {
+  return config;
+}
+function defineGanttView(config) {
+  return config;
+}
+function defineCardsView(config) {
+  return config;
+}
 function defineAction(config) {
   return config;
 }
@@ -1911,7 +1931,7 @@ function publicMetadata(meta) {
 }
 function workflowCapabilities(workflow, user) {
   const capabilities = new Set(Array.isArray(user?.capabilities) ? user.capabilities : []);
-  const roles = Array.isArray(user?.roles) ? user.roles : [];
+  const roles = Array.isArray(user?.roles) ? user.roles : typeof user?.role === "string" ? [user.role] : [];
   for (const mapping of workflow.roles ?? []) {
     if (roles.includes(mapping.role)) mapping.capabilities.forEach((capability) => capabilities.add(capability));
   }
@@ -2302,10 +2322,12 @@ function getAdminRoleForCollection(collection) {
   return "admin";
 }
 function isUserAdmin(user, collection) {
-  if (!user || !Array.isArray(user.roles)) return false;
+  if (!user) return false;
+  const roles = Array.isArray(user.roles) ? user.roles : typeof user.role === "string" ? [user.role] : [];
+  if (roles.length === 0) return false;
   const configuredRole = getAdminRoleForCollection(collection);
-  if (user.roles.includes(configuredRole)) return true;
-  return user.roles.includes("admin") || user.roles.includes("super_admin");
+  if (roles.includes(configuredRole)) return true;
+  return roles.includes("admin") || roles.includes("super_admin");
 }
 
 // src/utils/block-references.ts
@@ -3531,21 +3553,21 @@ function normalizeConfig(config) {
           }
         ];
       }
-      if (!existingFieldNames.has("roles")) {
+      if (!existingFieldNames.has("roles") && !existingFieldNames.has("role")) {
         fields = [
           ...fields,
           {
             name: "roles",
             type: "select",
             label: "Roles",
-            defaultValue: [],
+            defaultValue: "viewer",
             options: [
               { value: "admin", label: "Admin" },
               { value: "editor", label: "Editor" },
               { value: "viewer", label: "Viewer" }
             ],
             access: {
-              update: "user.roles && 'admin' in user.roles"
+              update: "user.role == 'admin' || (user.roles != null && 'admin' in user.roles)"
             }
           }
         ];
@@ -3563,10 +3585,10 @@ function normalizeConfig(config) {
               { value: "pending", label: "Pending" }
             ],
             access: {
-              update: "user.roles && 'admin' in user.roles && user.id != id"
+              update: "(user.role == 'admin' || (user.roles != null && 'admin' in user.roles)) && user.id != id"
             },
             admin: {
-              condition: `!(data.roles && "admin" in data.roles)`
+              condition: `!(data.roles && "admin" in data.roles) && data.role != "admin"`
             }
           }
         ];
@@ -3600,13 +3622,13 @@ function normalizeConfig(config) {
             }
           };
         }
-        if (field.name === "roles") {
+        if (field.name === "roles" || field.name === "role") {
           return {
             ...field,
             access: {
               ...field.access || {},
               // Must be an admin; cannot edit own roles (no self-elevation).
-              update: "user.roles && 'admin' in user.roles && user.id != id"
+              update: "(user.role == 'admin' || (user.roles != null && 'admin' in user.roles)) && user.id != id"
             }
           };
         }
@@ -3615,7 +3637,7 @@ function normalizeConfig(config) {
             ...field,
             access: {
               ...field.access || {},
-              update: "user.roles && 'admin' in user.roles && user.id != id"
+              update: "(user.role == 'admin' || (user.roles != null && 'admin' in user.roles)) && user.id != id"
             }
           };
         }
@@ -6298,7 +6320,7 @@ function sanitizeDocForAI(options) {
 // src/index.ts
 import { z } from "zod";
 function defineCollection(config) {
-  return config;
+  return asCollection(config);
 }
 function defineGlobal(config) {
   return config;
@@ -6326,17 +6348,26 @@ var defineTimeField = createFieldDefiner("time");
 var defineSelectField = createFieldDefiner("select");
 var defineMultiSelectField = createFieldDefiner("multiSelect");
 var defineRadioField = createFieldDefiner("radio");
-var defineRelationshipField = createFieldDefiner("relationship");
 var defineArrayField = createFieldDefiner("array");
 var defineObjectField = createFieldDefiner("object");
 var defineJsonField = createFieldDefiner("json");
 var defineBlocksField = createFieldDefiner("blocks");
-var defineImageField = createFieldDefiner("image");
 var defineEmailField = createFieldDefiner("email");
 var defineUrlField = createFieldDefiner("url");
 var defineIconField = createFieldDefiner("icon");
-var defineJoinField = createFieldDefiner("join");
 var defineRowField = createFieldDefiner("row");
+var _defineRelationshipFieldBase = createFieldDefiner("relationship");
+var _defineImageFieldBase = createFieldDefiner("image");
+var _defineJoinFieldBase = createFieldDefiner("join");
+function defineRelationshipField(config) {
+  return _defineRelationshipFieldBase(config);
+}
+function defineImageField(config) {
+  return _defineImageFieldBase(config);
+}
+function defineJoinField(config) {
+  return _defineJoinFieldBase(config);
+}
 function defineTab(args) {
   return args.fields.map((field) => ({
     ...field,
@@ -6361,6 +6392,7 @@ export {
   WORKFLOW_HISTORY_COLLECTION,
   abs,
   addDays,
+  asCollection,
   assertValidAdminConditionsInConfig,
   assertValidDeclarativeAccessInConfig,
   assertValidDeclarativeHookExpression,
@@ -6389,17 +6421,21 @@ export {
   defineBlock,
   defineBlocksField,
   defineBooleanField,
+  defineCalendarView,
+  defineCardsView,
   defineCollection,
   defineConfig,
   defineDateField,
   defineDateTimeField,
   defineEmailField,
   defineField,
+  defineGanttView,
   defineGlobal,
   defineIconField,
   defineImageField,
   defineJoinField,
   defineJsonField,
+  defineKanbanView,
   defineMultiSelectField,
   defineNumberField,
   defineObjectField,
@@ -6410,6 +6446,7 @@ export {
   defineRowField,
   defineSelectField,
   defineTab,
+  defineTableView,
   defineTextField,
   defineTextareaField,
   defineTimeField,

package/dist/server.cjs

@@ -6190,10 +6190,12 @@ function getAdminRoleForCollection(collection) {
   return "admin";
 }
 function isUserAdmin(user, collection) {
-  if (!user || !Array.isArray(user.roles)) return false;
+  if (!user) return false;
+  const roles = Array.isArray(user.roles) ? user.roles : typeof user.role === "string" ? [user.role] : [];
+  if (roles.length === 0) return false;
   const configuredRole = getAdminRoleForCollection(collection);
-  if (user.roles.includes(configuredRole)) return true;
-  return user.roles.includes("admin") || user.roles.includes("super_admin");
+  if (roles.includes(configuredRole)) return true;
+  return roles.includes("admin") || roles.includes("super_admin");
 }
 
 // src/utils/collection-search.ts
@@ -6449,7 +6451,7 @@ function publicMetadata(meta) {
 }
 function workflowCapabilities(workflow, user) {
   const capabilities = new Set(Array.isArray(user?.capabilities) ? user.capabilities : []);
-  const roles = Array.isArray(user?.roles) ? user.roles : [];
+  const roles = Array.isArray(user?.roles) ? user.roles : typeof user?.role === "string" ? [user.role] : [];
   for (const mapping of workflow.roles ?? []) {
     if (roles.includes(mapping.role)) mapping.capabilities.forEach((capability) => capabilities.add(capability));
   }
@@ -9526,7 +9528,14 @@ var AuthController = class {
       lockedUntil: _lockedUntil,
       ...safeUser
     } = user;
-    return safeUser;
+    const roles = Array.isArray(safeUser.roles) ? safeUser.roles : typeof safeUser.role === "string" ? [safeUser.role] : [];
+    const role = typeof safeUser.role === "string" ? safeUser.role : roles[0];
+    return {
+      ...safeUser,
+      collection: safeUser.collection || this.collection.slug,
+      ...role !== void 0 ? { role } : {},
+      roles
+    };
   }
   hasField(name) {
     return (this.collection.fields || []).some((field) => field.name === name);
@@ -9654,13 +9663,16 @@ var AuthController = class {
         }
       }
     }
+    const hasRoleField = this.collection.fields?.some((f) => f.name === "role");
+    const hasRolesField = this.collection.fields?.some((f) => f.name === "roles");
+    const rolePayload = hasRoleField && !hasRolesField ? { role: initialRole } : { roles: [initialRole] };
     const hashedPassword = await hashPassword(body.password);
     const user = await db.create({
       collection: this.collection.slug,
       data: {
         ...body,
         password: hashedPassword,
-        roles: [initialRole]
+        ...rolePayload
       }
     });
     const token = await issueAuthSessionToken({
@@ -9828,7 +9840,10 @@ var AuthController = class {
       return c.json({ error: true, message: "User not found." }, 404);
     }
     const safeUser = this.sanitizeUser(user);
-    return c.json(safeUser);
+    return c.json({
+      ...safeUser,
+      collection: this.collection.slug
+    });
   }
   // ---------------------------------------------------------------------------
   // POST /refresh-token
@@ -12054,8 +12069,12 @@ async function resolveUser(payload, config) {
     return null;
   }
   const { password: _password, ...safe } = doc;
+  const roles = Array.isArray(safe.roles) ? safe.roles : typeof safe.role === "string" ? [safe.role] : [];
+  const role = typeof safe.role === "string" ? safe.role : roles[0];
   return {
     ...safe,
+    ...role !== void 0 ? { role } : {},
+    roles,
     sub: payload.sub,
     email: payload.email ?? safe.email,
     collection: payload.collection
@@ -12137,7 +12156,12 @@ function optionalAuth(config) {
           c.set("user", user);
         }
         c.set("authTokenPayload", resolved.payload);
-      } catch {
+      } catch (err) {
+        getConfigLogger(config ?? c.get("config"), "auth").warn({
+          err,
+          msg: "optionalAuth failed to resolve token",
+          path: c.req.path
+        });
       }
     }
     await next();
@@ -14638,21 +14662,21 @@ function normalizeConfig(config) {
           }
         ];
       }
-      if (!existingFieldNames.has("roles")) {
+      if (!existingFieldNames.has("roles") && !existingFieldNames.has("role")) {
         fields = [
           ...fields,
           {
             name: "roles",
             type: "select",
             label: "Roles",
-            defaultValue: [],
+            defaultValue: "viewer",
             options: [
               { value: "admin", label: "Admin" },
               { value: "editor", label: "Editor" },
               { value: "viewer", label: "Viewer" }
             ],
             access: {
-              update: "user.roles && 'admin' in user.roles"
+              update: "user.role == 'admin' || (user.roles != null && 'admin' in user.roles)"
             }
           }
         ];
@@ -14670,10 +14694,10 @@ function normalizeConfig(config) {
               { value: "pending", label: "Pending" }
             ],
             access: {
-              update: "user.roles && 'admin' in user.roles && user.id != id"
+              update: "(user.role == 'admin' || (user.roles != null && 'admin' in user.roles)) && user.id != id"
             },
             admin: {
-              condition: `!(data.roles && "admin" in data.roles)`
+              condition: `!(data.roles && "admin" in data.roles) && data.role != "admin"`
             }
           }
         ];
@@ -14707,13 +14731,13 @@ function normalizeConfig(config) {
             }
           };
         }
-        if (field.name === "roles") {
+        if (field.name === "roles" || field.name === "role") {
           return {
             ...field,
             access: {
               ...field.access || {},
               // Must be an admin; cannot edit own roles (no self-elevation).
-              update: "user.roles && 'admin' in user.roles && user.id != id"
+              update: "(user.role == 'admin' || (user.roles != null && 'admin' in user.roles)) && user.id != id"
             }
           };
         }
@@ -14722,7 +14746,7 @@ function normalizeConfig(config) {
             ...field,
             access: {
               ...field.access || {},
-              update: "user.roles && 'admin' in user.roles && user.id != id"
+              update: "(user.role == 'admin' || (user.roles != null && 'admin' in user.roles)) && user.id != id"
             }
           };
         }