@dyrected/core 2.5.48 → 2.5.51

package/dist/index.cjs

@@ -44,6 +44,7 @@ __export(index_exports, {
   parseSort: () => parseSort,
   parseSqlWhere: () => parseSqlWhere,
   publishingWorkflow: () => publishingWorkflow,
+  resolveAdminAuthCollection: () => resolveAdminAuthCollection,
   runCollectionHooks: () => runCollectionHooks,
   saveWorkflowDraft: () => saveWorkflowDraft,
   transitionWorkflow: () => transitionWorkflow,
@@ -322,22 +323,29 @@ async function transitionWorkflow(args) {
 
 // src/utils/admin-auth.ts
 function getAdminAuthCollection(config) {
-  const requestedSlug = config.adminAuth?.collectionSlug;
-  if (requestedSlug) {
-    return config.collections.find((collection) => collection.slug === requestedSlug) ?? null;
+  const adminCollection = resolveAdminAuthCollection(config.collections, config.adminAuth?.collectionSlug);
+  return adminCollection ?? null;
+}
+function resolveAdminAuthCollection(collections, collectionSlug) {
+  const adminsCollection = collections.find((collection) => collection.slug === "__admins");
+  if (adminsCollection) return adminsCollection;
+  if (collectionSlug) {
+    const requestedCollection = collections.find((collection) => collection.slug === collectionSlug);
+    if (requestedCollection) return requestedCollection;
   }
-  return config.collections.find((collection) => collection.slug === "__admins") ?? config.collections.find((collection) => collection.auth) ?? null;
+  return collections.find((collection) => collection.auth);
 }
-function getPublicAdminAuthConfig(adminAuth) {
+function getPublicAdminAuthConfig(adminAuth, collections) {
   const providers = (adminAuth?.providers ?? []).map((provider) => ({
     id: provider.id,
     type: provider.type,
     displayName: provider.displayName || humanizeProviderName(provider.id, provider.type),
     autoRedirect: provider.autoRedirect
   }));
+  const resolvedCollectionSlug = collections ? resolveAdminAuthCollection(collections, adminAuth?.collectionSlug)?.slug : adminAuth?.collectionSlug;
   return {
     mode: adminAuth?.mode ?? "local",
-    collectionSlug: adminAuth?.collectionSlug,
+    collectionSlug: resolvedCollectionSlug,
     provisioningMode: adminAuth?.provisioningMode,
     providers
   };
@@ -1775,6 +1783,7 @@ function defineConfig(config) {
   parseSort,
   parseSqlWhere,
   publishingWorkflow,
+  resolveAdminAuthCollection,
   runCollectionHooks,
   saveWorkflowDraft,
   transitionWorkflow,

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { F as Field, B as Block, D as DyrectedConfig, C as CollectionConfig, A as AdminAuthConfig, P as PublicAdminAuthConfig, W as WorkflowConfig, a as AuthenticatedUser, b as WorkflowTransition, L as LifecycleEventName, c as LifecycleEvent, d as BaseDocument, H as HookRequestContext, G as GlobalConfig } from './app-config-3XBnu9Xz.cjs';
-export { e as AccessFunction, f as AdminAuthAccessResolution, g as AdminAuthClaimMapping, h as AdminAuthMember, i as AdminAuthProvider, j as AdminAuthProviderMembersConfig, k as AdminAuthProvisioningMode, l as AdminAuthResolveAccessArgs, m as AdminAuthResolvedIdentity, n as AdminConfig, o as AdminDashboardComponentSlots, p as AdminIconName, q as ArrayField, r as BaseAdminAuthProvider, s as BlocksField, t as BooleanField, u as CharacterLimitFieldConfig, v as CollectionAfterChangeHook, w as CollectionAfterDeleteHook, x as CollectionAfterReadHook, y as CollectionAfterTransitionHook, z as CollectionBeforeChangeHook, E as CollectionBeforeDeleteHook, I as CollectionBeforeReadHook, J as CollectionBeforeTransitionHook, K as CollectionListComponentSlots, M as CustomAdminAuthProvider, N as DatabaseAdapter, O as DateField, Q as DateTimeField, R as DynamicOptionItem, S as DynamicOptionsConfig, T as DynamicOptionsResolver, U as DynamicOptionsResolverArgs, V as EmailField, X as FieldAdminOnChangeHook, Y as FieldAdminOnChangeHookArgs, Z as FieldAdminOptionsHook, _ as FieldAdminOptionsHookArgs, $ as FieldAdminOptionsHookResult, a0 as FieldAfterReadHook, a1 as FieldAfterReadHookArgs, a2 as FieldBeforeChangeHook, a3 as FieldBeforeChangeHookArgs, a4 as FieldHook, a5 as FieldType, a6 as FileData, a7 as GlobalAfterChangeHook, a8 as GlobalAfterReadHook, a9 as GlobalBeforeChangeHook, aa as GlobalBeforeReadHook, ab as HookFunction, ac as IconField, ad as ImageField, ae as ImageService, af as JoinField, ag as JsonField, ah as LIFECYCLE_EVENT_NAMES, ai as LifecycleEventHandler, aj as MultiSelectField, ak as NumberField, al as OIDCAdminAuthProvider, am as ObjectField, an as PaginatedResult, ao as PublicAdminAuthProvider, ap as RadioField, aq as ReadonlyDatabaseAdapter, ar as RelationshipField, as as RichTextField, at as RowField, au as SelectField, av as StorageAdapter, aw as TextField, ax as TextareaField, ay as TimeField, az as UploadConfig, aA as UrlField, aB as WordLimitFieldConfig, aC as WorkflowMetadata, aD as WorkflowRole, aE as WorkflowState, aF as WorkflowTransitionContext } from './app-config-3XBnu9Xz.cjs';
+import { F as Field, B as Block, D as DyrectedConfig, C as CollectionConfig, A as AdminAuthConfig, P as PublicAdminAuthConfig, W as WorkflowConfig, a as AuthenticatedUser, b as WorkflowTransition, L as LifecycleEventName, c as LifecycleEvent, d as BaseDocument, H as HookRequestContext, G as GlobalConfig } from './app-config-CaEQH0Kb.cjs';
+export { e as AccessFunction, f as AdminAuthAccessResolution, g as AdminAuthClaimMapping, h as AdminAuthMember, i as AdminAuthProvider, j as AdminAuthProviderMembersConfig, k as AdminAuthProvisioningMode, l as AdminAuthResolveAccessArgs, m as AdminAuthResolvedIdentity, n as AdminConfig, o as AdminDashboardComponentSlots, p as AdminIconName, q as ArrayField, r as BaseAdminAuthProvider, s as BlocksField, t as BooleanField, u as CharacterLimitFieldConfig, v as CollectionAfterChangeHook, w as CollectionAfterDeleteHook, x as CollectionAfterReadHook, y as CollectionAfterTransitionHook, z as CollectionBeforeChangeHook, E as CollectionBeforeDeleteHook, I as CollectionBeforeReadHook, J as CollectionBeforeTransitionHook, K as CollectionListComponentSlots, M as CustomAdminAuthProvider, N as DatabaseAdapter, O as DateField, Q as DateTimeField, R as DynamicOptionItem, S as DynamicOptionsConfig, T as DynamicOptionsResolver, U as DynamicOptionsResolverArgs, V as EmailField, X as FieldAdminOnChangeHook, Y as FieldAdminOnChangeHookArgs, Z as FieldAdminOptionsHook, _ as FieldAdminOptionsHookArgs, $ as FieldAdminOptionsHookResult, a0 as FieldAfterReadHook, a1 as FieldAfterReadHookArgs, a2 as FieldBeforeChangeHook, a3 as FieldBeforeChangeHookArgs, a4 as FieldHook, a5 as FieldType, a6 as FileData, a7 as GlobalAfterChangeHook, a8 as GlobalAfterReadHook, a9 as GlobalBeforeChangeHook, aa as GlobalBeforeReadHook, ab as HookFunction, ac as IconField, ad as ImageField, ae as ImageService, af as JoinField, ag as JsonField, ah as LIFECYCLE_EVENT_NAMES, ai as LifecycleEventHandler, aj as MultiSelectField, ak as NumberField, al as OIDCAdminAuthProvider, am as ObjectField, an as PaginatedResult, ao as PublicAdminAuthProvider, ap as RadioField, aq as ReadonlyDatabaseAdapter, ar as RelationshipField, as as RichTextField, at as RowField, au as SelectField, av as StorageAdapter, aw as TextField, ax as TextareaField, ay as TimeField, az as UploadConfig, aA as UrlField, aB as WordLimitFieldConfig, aC as WorkflowMetadata, aD as WorkflowRole, aE as WorkflowState, aF as WorkflowTransitionContext } from './app-config-CaEQH0Kb.cjs';
 import 'lucide-react';
 
 type Prettify<T> = {
@@ -81,7 +81,8 @@ type UploadDocFields = {
 declare function normalizeConfig(config: DyrectedConfig): DyrectedConfig;
 
 declare function getAdminAuthCollection(config: Pick<DyrectedConfig, "collections" | "adminAuth">): CollectionConfig | null;
-declare function getPublicAdminAuthConfig(adminAuth?: AdminAuthConfig): PublicAdminAuthConfig;
+declare function resolveAdminAuthCollection(collections: CollectionConfig[], collectionSlug?: string): CollectionConfig | undefined;
+declare function getPublicAdminAuthConfig(adminAuth?: AdminAuthConfig, collections?: CollectionConfig[]): PublicAdminAuthConfig;
 
 /**
  * Dyrected Where Clause DSL — shared query language across all database adapters.
@@ -341,4 +342,4 @@ declare function defineGlobal<TDoc extends object>(config: GlobalConfig<TDoc>):
  */
 declare function defineConfig(config: DyrectedConfig): DyrectedConfig;
 
-export { AdminAuthConfig, type AuthDocFields, AuthenticatedUser, BaseDocument, Block, CollectionConfig, DyrectedConfig, Field, GlobalConfig, HookRequestContext, type InferDocShape, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, type Prettify, PublicAdminAuthConfig, type SortClause, type SortDirection, type SqlWhereResult, type SystemDocFields, type UploadDocFields, WORKFLOW_HISTORY_COLLECTION, type WhereClause, type WhereOperator, type WhereOperatorName, WorkflowConfig, WorkflowTransition, availableWorkflowTransitions, canViewWorkflowDraft, createLifecycleEvent, createWorkflowDocument, defineCollection, defineConfig, defineGlobal, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, executeFieldAfterRead, executeFieldBeforeChange, generateOpenApi, getAdminAuthCollection, getPublicAdminAuthConfig, initializeWorkflowDocument, materializeWorkflowDocument, normalizeConfig, parseMongoWhere, parseSort, parseSqlWhere, publishingWorkflow, runCollectionHooks, saveWorkflowDraft, transitionWorkflow, workflowCapabilities };
+export { AdminAuthConfig, type AuthDocFields, AuthenticatedUser, BaseDocument, Block, CollectionConfig, DyrectedConfig, Field, GlobalConfig, HookRequestContext, type InferDocShape, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, type Prettify, PublicAdminAuthConfig, type SortClause, type SortDirection, type SqlWhereResult, type SystemDocFields, type UploadDocFields, WORKFLOW_HISTORY_COLLECTION, type WhereClause, type WhereOperator, type WhereOperatorName, WorkflowConfig, WorkflowTransition, availableWorkflowTransitions, canViewWorkflowDraft, createLifecycleEvent, createWorkflowDocument, defineCollection, defineConfig, defineGlobal, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, executeFieldAfterRead, executeFieldBeforeChange, generateOpenApi, getAdminAuthCollection, getPublicAdminAuthConfig, initializeWorkflowDocument, materializeWorkflowDocument, normalizeConfig, parseMongoWhere, parseSort, parseSqlWhere, publishingWorkflow, resolveAdminAuthCollection, runCollectionHooks, saveWorkflowDraft, transitionWorkflow, workflowCapabilities };

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, W as WorkflowConfig, a as AuthenticatedUser, b as WorkflowTransition, L as LifecycleEventName, c as LifecycleEvent, d as BaseDocument, H as HookRequestContext, G as GlobalConfig } from './app-config-3XBnu9Xz.js';
-export { e as AccessFunction, f as AdminAuthAccessResolution, g as AdminAuthClaimMapping, h as AdminAuthMember, i as AdminAuthProvider, j as AdminAuthProviderMembersConfig, k as AdminAuthProvisioningMode, l as AdminAuthResolveAccessArgs, m as AdminAuthResolvedIdentity, n as AdminConfig, o as AdminDashboardComponentSlots, p as AdminIconName, q as ArrayField, r as BaseAdminAuthProvider, s as BlocksField, t as BooleanField, u as CharacterLimitFieldConfig, v as CollectionAfterChangeHook, w as CollectionAfterDeleteHook, x as CollectionAfterReadHook, y as CollectionAfterTransitionHook, z as CollectionBeforeChangeHook, E as CollectionBeforeDeleteHook, I as CollectionBeforeReadHook, J as CollectionBeforeTransitionHook, K as CollectionListComponentSlots, M as CustomAdminAuthProvider, N as DatabaseAdapter, O as DateField, Q as DateTimeField, R as DynamicOptionItem, S as DynamicOptionsConfig, T as DynamicOptionsResolver, U as DynamicOptionsResolverArgs, V as EmailField, X as FieldAdminOnChangeHook, Y as FieldAdminOnChangeHookArgs, Z as FieldAdminOptionsHook, _ as FieldAdminOptionsHookArgs, $ as FieldAdminOptionsHookResult, a0 as FieldAfterReadHook, a1 as FieldAfterReadHookArgs, a2 as FieldBeforeChangeHook, a3 as FieldBeforeChangeHookArgs, a4 as FieldHook, a5 as FieldType, a6 as FileData, a7 as GlobalAfterChangeHook, a8 as GlobalAfterReadHook, a9 as GlobalBeforeChangeHook, aa as GlobalBeforeReadHook, ab as HookFunction, ac as IconField, ad as ImageField, ae as ImageService, af as JoinField, ag as JsonField, ah as LIFECYCLE_EVENT_NAMES, ai as LifecycleEventHandler, aj as MultiSelectField, ak as NumberField, al as OIDCAdminAuthProvider, am as ObjectField, an as PaginatedResult, ao as PublicAdminAuthProvider, ap as RadioField, aq as ReadonlyDatabaseAdapter, ar as RelationshipField, as as RichTextField, at as RowField, au as SelectField, av as StorageAdapter, aw as TextField, ax as TextareaField, ay as TimeField, az as UploadConfig, aA as UrlField, aB as WordLimitFieldConfig, aC as WorkflowMetadata, aD as WorkflowRole, aE as WorkflowState, aF as WorkflowTransitionContext } from './app-config-3XBnu9Xz.js';
+import { F as Field, B as Block, D as DyrectedConfig, C as CollectionConfig, A as AdminAuthConfig, P as PublicAdminAuthConfig, W as WorkflowConfig, a as AuthenticatedUser, b as WorkflowTransition, L as LifecycleEventName, c as LifecycleEvent, d as BaseDocument, H as HookRequestContext, G as GlobalConfig } from './app-config-CaEQH0Kb.js';
+export { e as AccessFunction, f as AdminAuthAccessResolution, g as AdminAuthClaimMapping, h as AdminAuthMember, i as AdminAuthProvider, j as AdminAuthProviderMembersConfig, k as AdminAuthProvisioningMode, l as AdminAuthResolveAccessArgs, m as AdminAuthResolvedIdentity, n as AdminConfig, o as AdminDashboardComponentSlots, p as AdminIconName, q as ArrayField, r as BaseAdminAuthProvider, s as BlocksField, t as BooleanField, u as CharacterLimitFieldConfig, v as CollectionAfterChangeHook, w as CollectionAfterDeleteHook, x as CollectionAfterReadHook, y as CollectionAfterTransitionHook, z as CollectionBeforeChangeHook, E as CollectionBeforeDeleteHook, I as CollectionBeforeReadHook, J as CollectionBeforeTransitionHook, K as CollectionListComponentSlots, M as CustomAdminAuthProvider, N as DatabaseAdapter, O as DateField, Q as DateTimeField, R as DynamicOptionItem, S as DynamicOptionsConfig, T as DynamicOptionsResolver, U as DynamicOptionsResolverArgs, V as EmailField, X as FieldAdminOnChangeHook, Y as FieldAdminOnChangeHookArgs, Z as FieldAdminOptionsHook, _ as FieldAdminOptionsHookArgs, $ as FieldAdminOptionsHookResult, a0 as FieldAfterReadHook, a1 as FieldAfterReadHookArgs, a2 as FieldBeforeChangeHook, a3 as FieldBeforeChangeHookArgs, a4 as FieldHook, a5 as FieldType, a6 as FileData, a7 as GlobalAfterChangeHook, a8 as GlobalAfterReadHook, a9 as GlobalBeforeChangeHook, aa as GlobalBeforeReadHook, ab as HookFunction, ac as IconField, ad as ImageField, ae as ImageService, af as JoinField, ag as JsonField, ah as LIFECYCLE_EVENT_NAMES, ai as LifecycleEventHandler, aj as MultiSelectField, ak as NumberField, al as OIDCAdminAuthProvider, am as ObjectField, an as PaginatedResult, ao as PublicAdminAuthProvider, ap as RadioField, aq as ReadonlyDatabaseAdapter, ar as RelationshipField, as as RichTextField, at as RowField, au as SelectField, av as StorageAdapter, aw as TextField, ax as TextareaField, ay as TimeField, az as UploadConfig, aA as UrlField, aB as WordLimitFieldConfig, aC as WorkflowMetadata, aD as WorkflowRole, aE as WorkflowState, aF as WorkflowTransitionContext } from './app-config-CaEQH0Kb.js';
 import 'lucide-react';
 
 type Prettify<T> = {
@@ -81,7 +81,8 @@ type UploadDocFields = {
 declare function normalizeConfig(config: DyrectedConfig): DyrectedConfig;
 
 declare function getAdminAuthCollection(config: Pick<DyrectedConfig, "collections" | "adminAuth">): CollectionConfig | null;
-declare function getPublicAdminAuthConfig(adminAuth?: AdminAuthConfig): PublicAdminAuthConfig;
+declare function resolveAdminAuthCollection(collections: CollectionConfig[], collectionSlug?: string): CollectionConfig | undefined;
+declare function getPublicAdminAuthConfig(adminAuth?: AdminAuthConfig, collections?: CollectionConfig[]): PublicAdminAuthConfig;
 
 /**
  * Dyrected Where Clause DSL — shared query language across all database adapters.
@@ -341,4 +342,4 @@ declare function defineGlobal<TDoc extends object>(config: GlobalConfig<TDoc>):
  */
 declare function defineConfig(config: DyrectedConfig): DyrectedConfig;
 
-export { AdminAuthConfig, type AuthDocFields, AuthenticatedUser, BaseDocument, Block, CollectionConfig, DyrectedConfig, Field, GlobalConfig, HookRequestContext, type InferDocShape, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, type Prettify, PublicAdminAuthConfig, type SortClause, type SortDirection, type SqlWhereResult, type SystemDocFields, type UploadDocFields, WORKFLOW_HISTORY_COLLECTION, type WhereClause, type WhereOperator, type WhereOperatorName, WorkflowConfig, WorkflowTransition, availableWorkflowTransitions, canViewWorkflowDraft, createLifecycleEvent, createWorkflowDocument, defineCollection, defineConfig, defineGlobal, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, executeFieldAfterRead, executeFieldBeforeChange, generateOpenApi, getAdminAuthCollection, getPublicAdminAuthConfig, initializeWorkflowDocument, materializeWorkflowDocument, normalizeConfig, parseMongoWhere, parseSort, parseSqlWhere, publishingWorkflow, runCollectionHooks, saveWorkflowDraft, transitionWorkflow, workflowCapabilities };
+export { AdminAuthConfig, type AuthDocFields, AuthenticatedUser, BaseDocument, Block, CollectionConfig, DyrectedConfig, Field, GlobalConfig, HookRequestContext, type InferDocShape, LIFECYCLE_EVENTS_COLLECTION, LifecycleEvent, LifecycleEventName, type Prettify, PublicAdminAuthConfig, type SortClause, type SortDirection, type SqlWhereResult, type SystemDocFields, type UploadDocFields, WORKFLOW_HISTORY_COLLECTION, type WhereClause, type WhereOperator, type WhereOperatorName, WorkflowConfig, WorkflowTransition, availableWorkflowTransitions, canViewWorkflowDraft, createLifecycleEvent, createWorkflowDocument, defineCollection, defineConfig, defineGlobal, dispatchLifecycleEvent, dispatchPendingLifecycleEvents, executeFieldAfterRead, executeFieldBeforeChange, generateOpenApi, getAdminAuthCollection, getPublicAdminAuthConfig, initializeWorkflowDocument, materializeWorkflowDocument, normalizeConfig, parseMongoWhere, parseSort, parseSqlWhere, publishingWorkflow, resolveAdminAuthCollection, runCollectionHooks, saveWorkflowDraft, transitionWorkflow, workflowCapabilities };

package/dist/index.js

@@ -16,11 +16,12 @@ import {
   materializeWorkflowDocument,
   normalizeConfig,
   publishingWorkflow,
+  resolveAdminAuthCollection,
   runCollectionHooks,
   saveWorkflowDraft,
   transitionWorkflow,
   workflowCapabilities
-} from "./chunk-FCXE5CVC.js";
+} from "./chunk-L65PQYDP.js";
 
 // src/types/workflows.ts
 var LIFECYCLE_EVENT_NAMES = [
@@ -240,6 +241,7 @@ export {
   parseSort,
   parseSqlWhere,
   publishingWorkflow,
+  resolveAdminAuthCollection,
   runCollectionHooks,
   saveWorkflowDraft,
   transitionWorkflow,

package/dist/server.cjs

@@ -154,6 +154,7 @@ var DefaultsService = class {
 };
 
 // src/services/population.service.ts
+var import_jexl = __toESM(require("jexl"), 1);
 var PopulationService = class {
   db;
   collections;
@@ -258,7 +259,28 @@ var PopulationService = class {
               maxDepth
             });
             const identifier = docWithDefaults.slug || docWithDefaults.id;
-            const resolvedUrl = `/collections/${value.relationTo}/${identifier}`;
+            let resolvedUrl = `/collections/${value.relationTo}/${identifier}`;
+            const previewUrlPattern = relatedCollection.admin?.previewUrl || relatedCollection.admin?.urlPattern;
+            if (previewUrlPattern) {
+              if (typeof previewUrlPattern === "function") {
+                try {
+                  resolvedUrl = previewUrlPattern(docWithDefaults, { locale: "en" }) || resolvedUrl;
+                } catch {
+                }
+              } else if (typeof previewUrlPattern === "string") {
+                if (previewUrlPattern.includes("{{")) {
+                  resolvedUrl = previewUrlPattern.replace(/{{(.*?)}}/g, (_, key) => String(docWithDefaults[key.trim()] || ""));
+                } else if (previewUrlPattern.includes("+") || previewUrlPattern.includes("?") || previewUrlPattern.includes("==") || previewUrlPattern.includes("siteUrl")) {
+                  try {
+                    resolvedUrl = import_jexl.default.evalSync(previewUrlPattern, docWithDefaults);
+                  } catch (err) {
+                    resolvedUrl = previewUrlPattern.replace(/:([a-zA-Z0-9_]+)/g, (_, key) => String(docWithDefaults[key] || ""));
+                  }
+                } else {
+                  resolvedUrl = previewUrlPattern.replace(/:([a-zA-Z0-9_]+)/g, (_, key) => String(docWithDefaults[key] || ""));
+                }
+              }
+            }
             populatedDoc[field.name] = {
               ...value,
               url: resolvedUrl,
@@ -540,12 +562,12 @@ function createReadonlyDb(db) {
 }
 
 // src/auth/jexl.ts
-var import_jexl = __toESM(require("jexl"), 1);
+var import_jexl2 = __toESM(require("jexl"), 1);
 async function evaluateAccess(expression, context) {
   if (expression === void 0 || expression === null) return false;
   if (typeof expression === "boolean") return expression;
   try {
-    const result = await import_jexl.default.eval(expression, context);
+    const result = await import_jexl2.default.eval(expression, context);
     return !!result;
   } catch (err) {
     console.error("[dyrected/core] Jexl evaluation failed:", err);
@@ -555,22 +577,29 @@ async function evaluateAccess(expression, context) {
 
 // src/utils/admin-auth.ts
 function getAdminAuthCollection(config) {
-  const requestedSlug = config.adminAuth?.collectionSlug;
-  if (requestedSlug) {
-    return config.collections.find((collection) => collection.slug === requestedSlug) ?? null;
+  const adminCollection = resolveAdminAuthCollection(config.collections, config.adminAuth?.collectionSlug);
+  return adminCollection ?? null;
+}
+function resolveAdminAuthCollection(collections, collectionSlug) {
+  const adminsCollection = collections.find((collection) => collection.slug === "__admins");
+  if (adminsCollection) return adminsCollection;
+  if (collectionSlug) {
+    const requestedCollection = collections.find((collection) => collection.slug === collectionSlug);
+    if (requestedCollection) return requestedCollection;
   }
-  return config.collections.find((collection) => collection.slug === "__admins") ?? config.collections.find((collection) => collection.auth) ?? null;
+  return collections.find((collection) => collection.auth);
 }
-function getPublicAdminAuthConfig(adminAuth) {
+function getPublicAdminAuthConfig(adminAuth, collections) {
   const providers = (adminAuth?.providers ?? []).map((provider) => ({
     id: provider.id,
     type: provider.type,
     displayName: provider.displayName || humanizeProviderName(provider.id, provider.type),
     autoRedirect: provider.autoRedirect
   }));
+  const resolvedCollectionSlug = collections ? resolveAdminAuthCollection(collections, adminAuth?.collectionSlug)?.slug : adminAuth?.collectionSlug;
   return {
     mode: adminAuth?.mode ?? "local",
-    collectionSlug: adminAuth?.collectionSlug,
+    collectionSlug: resolvedCollectionSlug,
     provisioningMode: adminAuth?.provisioningMode,
     providers
   };
@@ -818,12 +847,20 @@ var CollectionController = class {
     }
     return config.adminAuth?.providers?.find((p) => p.members) || null;
   }
+  toHookRequestContext(c) {
+    return {
+      query: c.req.query(),
+      headers: c.req.header(),
+      raw: c.req.raw
+    };
+  }
   async find(c) {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && provider.members?.list) {
+      const hookReq = this.toHookRequestContext(c);
       const limit2 = Number(c.req.query("limit")) || 10;
       const page2 = Number(c.req.query("page")) || 1;
       const sort2 = c.req.query("sort") || void 0;
@@ -835,7 +872,7 @@ var CollectionController = class {
         } catch {
         }
       }
-      const paginatedResult = await provider.members.list({ limit: limit2, page: page2, sort: sort2, where: where2, req: c.req });
+      const paginatedResult = await provider.members.list({ limit: limit2, page: page2, sort: sort2, where: where2, req: hookReq });
       const mappedDocs = [];
       for (const m of paginatedResult.docs) {
         let localId = m.id;
@@ -942,15 +979,16 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && (provider.members?.get || provider.members?.list)) {
+      const hookReq = this.toHookRequestContext(c);
       const id2 = c.req.param("id");
       if (!id2) return c.json({ message: "Missing ID" }, 400);
       const localDoc = await db.findOne({ collection: this.collection.slug, id: id2 });
       const externalSubject = localDoc?.externalSubject || id2;
       let member = null;
       if (provider.members.get) {
-        member = await provider.members.get({ externalSubject, req: c.req });
+        member = await provider.members.get({ externalSubject, req: hookReq });
       } else if (provider.members.list) {
-        const listResult = await provider.members.list({ req: c.req });
+        const listResult = await provider.members.list({ req: hookReq });
         member = listResult.docs.find((m) => m.id === externalSubject) || null;
       }
       if (!member) return c.json({ message: "Not Found" }, 404);
@@ -997,12 +1035,13 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && provider.members?.create) {
+      const hookReq = this.toHookRequestContext(c);
       const contentType2 = c.req.header("Content-Type") || "";
       if (contentType2.toLowerCase().includes("multipart/form-data")) {
         return this.upload(c);
       }
       const body2 = await c.req.json();
-      const member = await provider.members.create({ data: body2, req: c.req });
+      const member = await provider.members.create({ data: body2, req: hookReq });
       return c.json({
         ...member,
         id: member.id,
@@ -1137,12 +1176,13 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && provider.members?.update) {
+      const hookReq = this.toHookRequestContext(c);
       const id2 = c.req.param("id");
       if (!id2) return c.json({ message: "Missing ID" }, 400);
       const body2 = await c.req.json();
       const localDoc = await db.findOne({ collection: this.collection.slug, id: id2 });
       const externalSubject = localDoc?.externalSubject || id2;
-      const member = await provider.members.update({ externalSubject, data: body2, req: c.req });
+      const member = await provider.members.update({ externalSubject, data: body2, req: hookReq });
       return c.json({
         ...member,
         id: localDoc ? localDoc.id : member.id,
@@ -1339,11 +1379,12 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && provider.members?.delete) {
+      const hookReq = this.toHookRequestContext(c);
       const id2 = c.req.param("id");
       if (!id2) return c.json({ message: "Missing ID" }, 400);
       const localDoc = await db.findOne({ collection: this.collection.slug, id: id2 });
       const externalSubject = localDoc?.externalSubject || id2;
-      await provider.members.delete({ externalSubject, req: c.req });
+      await provider.members.delete({ externalSubject, req: hookReq });
       return c.json({ message: "Deleted" });
     }
     const readonlyDb = createReadonlyDb(db);
@@ -2234,8 +2275,9 @@ var AdminAuthController = class {
     this.config = config;
   }
   config;
-  providers(c) {
-    return c.json(getPublicAdminAuthConfig(this.config.adminAuth));
+  async providers(c) {
+    const requestConfig = await this.getRequestConfig(c);
+    return c.json(getPublicAdminAuthConfig(requestConfig.adminAuth, requestConfig.collections));
   }
   async start(c) {
     const requestConfig = await this.getRequestConfig(c);
@@ -3728,7 +3770,7 @@ function registerRoutes(app, config) {
       collections: filteredCollections,
       globals: filteredGlobals,
       admin: config.admin || {},
-      adminAuth: getPublicAdminAuthConfig(config.adminAuth)
+      adminAuth: getPublicAdminAuthConfig(config.adminAuth, collections)
     });
   });
   app.get("/api/dyrected/options/:collection/:field", optionalAuth(), async (c) => {

package/dist/server.d.cts

@@ -1,7 +1,7 @@
 import * as hono_types from 'hono/types';
 import * as hono from 'hono';
 import { Hono, Context } from 'hono';
-import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-3XBnu9Xz.cjs';
+import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-CaEQH0Kb.cjs';
 import * as hono_utils_http_status from 'hono/utils/http-status';
 import * as hono_utils_types from 'hono/utils/types';
 import 'lucide-react';
@@ -156,6 +156,7 @@ declare class CollectionController {
     private collection;
     constructor(collection: CollectionConfig);
     private getDelegatedProvider;
+    private toHookRequestContext;
     find(c: Context<DyrectedContext>): Promise<(Response & hono.TypedResponse<{
         message: string;
     }, 500, "json">) | (Response & hono.TypedResponse<{

package/dist/server.d.ts

@@ -1,7 +1,7 @@
 import * as hono_types from 'hono/types';
 import * as hono from 'hono';
 import { Hono, Context } from 'hono';
-import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-3XBnu9Xz.js';
+import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-CaEQH0Kb.js';
 import * as hono_utils_http_status from 'hono/utils/http-status';
 import * as hono_utils_types from 'hono/utils/types';
 import 'lucide-react';
@@ -156,6 +156,7 @@ declare class CollectionController {
     private collection;
     constructor(collection: CollectionConfig);
     private getDelegatedProvider;
+    private toHookRequestContext;
     find(c: Context<DyrectedContext>): Promise<(Response & hono.TypedResponse<{
         message: string;
     }, 500, "json">) | (Response & hono.TypedResponse<{

package/dist/server.js

@@ -13,7 +13,7 @@ import {
   runCollectionHooks,
   saveWorkflowDraft,
   transitionWorkflow
-} from "./chunk-FCXE5CVC.js";
+} from "./chunk-L65PQYDP.js";
 
 // src/app.ts
 import { Hono } from "hono";
@@ -64,6 +64,7 @@ var DefaultsService = class {
 };
 
 // src/services/population.service.ts
+import jexl from "jexl";
 var PopulationService = class {
   db;
   collections;
@@ -168,7 +169,28 @@ var PopulationService = class {
               maxDepth
             });
             const identifier = docWithDefaults.slug || docWithDefaults.id;
-            const resolvedUrl = `/collections/${value.relationTo}/${identifier}`;
+            let resolvedUrl = `/collections/${value.relationTo}/${identifier}`;
+            const previewUrlPattern = relatedCollection.admin?.previewUrl || relatedCollection.admin?.urlPattern;
+            if (previewUrlPattern) {
+              if (typeof previewUrlPattern === "function") {
+                try {
+                  resolvedUrl = previewUrlPattern(docWithDefaults, { locale: "en" }) || resolvedUrl;
+                } catch {
+                }
+              } else if (typeof previewUrlPattern === "string") {
+                if (previewUrlPattern.includes("{{")) {
+                  resolvedUrl = previewUrlPattern.replace(/{{(.*?)}}/g, (_, key) => String(docWithDefaults[key.trim()] || ""));
+                } else if (previewUrlPattern.includes("+") || previewUrlPattern.includes("?") || previewUrlPattern.includes("==") || previewUrlPattern.includes("siteUrl")) {
+                  try {
+                    resolvedUrl = jexl.evalSync(previewUrlPattern, docWithDefaults);
+                  } catch (err) {
+                    resolvedUrl = previewUrlPattern.replace(/:([a-zA-Z0-9_]+)/g, (_, key) => String(docWithDefaults[key] || ""));
+                  }
+                } else {
+                  resolvedUrl = previewUrlPattern.replace(/:([a-zA-Z0-9_]+)/g, (_, key) => String(docWithDefaults[key] || ""));
+                }
+              }
+            }
             populatedDoc[field.name] = {
               ...value,
               url: resolvedUrl,
@@ -287,12 +309,12 @@ function createReadonlyDb(db) {
 }
 
 // src/auth/jexl.ts
-import jexl from "jexl";
+import jexl2 from "jexl";
 async function evaluateAccess(expression, context) {
   if (expression === void 0 || expression === null) return false;
   if (typeof expression === "boolean") return expression;
   try {
-    const result = await jexl.eval(expression, context);
+    const result = await jexl2.eval(expression, context);
     return !!result;
   } catch (err) {
     console.error("[dyrected/core] Jexl evaluation failed:", err);
@@ -314,12 +336,20 @@ var CollectionController = class {
     }
     return config.adminAuth?.providers?.find((p) => p.members) || null;
   }
+  toHookRequestContext(c) {
+    return {
+      query: c.req.query(),
+      headers: c.req.header(),
+      raw: c.req.raw
+    };
+  }
   async find(c) {
     const config = c.get("config");
     const db = config.db;
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && provider.members?.list) {
+      const hookReq = this.toHookRequestContext(c);
       const limit2 = Number(c.req.query("limit")) || 10;
       const page2 = Number(c.req.query("page")) || 1;
       const sort2 = c.req.query("sort") || void 0;
@@ -331,7 +361,7 @@ var CollectionController = class {
         } catch {
         }
       }
-      const paginatedResult = await provider.members.list({ limit: limit2, page: page2, sort: sort2, where: where2, req: c.req });
+      const paginatedResult = await provider.members.list({ limit: limit2, page: page2, sort: sort2, where: where2, req: hookReq });
       const mappedDocs = [];
       for (const m of paginatedResult.docs) {
         let localId = m.id;
@@ -438,15 +468,16 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && (provider.members?.get || provider.members?.list)) {
+      const hookReq = this.toHookRequestContext(c);
       const id2 = c.req.param("id");
       if (!id2) return c.json({ message: "Missing ID" }, 400);
       const localDoc = await db.findOne({ collection: this.collection.slug, id: id2 });
       const externalSubject = localDoc?.externalSubject || id2;
       let member = null;
       if (provider.members.get) {
-        member = await provider.members.get({ externalSubject, req: c.req });
+        member = await provider.members.get({ externalSubject, req: hookReq });
       } else if (provider.members.list) {
-        const listResult = await provider.members.list({ req: c.req });
+        const listResult = await provider.members.list({ req: hookReq });
         member = listResult.docs.find((m) => m.id === externalSubject) || null;
       }
       if (!member) return c.json({ message: "Not Found" }, 404);
@@ -493,12 +524,13 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && provider.members?.create) {
+      const hookReq = this.toHookRequestContext(c);
       const contentType2 = c.req.header("Content-Type") || "";
       if (contentType2.toLowerCase().includes("multipart/form-data")) {
         return this.upload(c);
       }
       const body2 = await c.req.json();
-      const member = await provider.members.create({ data: body2, req: c.req });
+      const member = await provider.members.create({ data: body2, req: hookReq });
       return c.json({
         ...member,
         id: member.id,
@@ -633,12 +665,13 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && provider.members?.update) {
+      const hookReq = this.toHookRequestContext(c);
       const id2 = c.req.param("id");
       if (!id2) return c.json({ message: "Missing ID" }, 400);
       const body2 = await c.req.json();
       const localDoc = await db.findOne({ collection: this.collection.slug, id: id2 });
       const externalSubject = localDoc?.externalSubject || id2;
-      const member = await provider.members.update({ externalSubject, data: body2, req: c.req });
+      const member = await provider.members.update({ externalSubject, data: body2, req: hookReq });
       return c.json({
         ...member,
         id: localDoc ? localDoc.id : member.id,
@@ -835,11 +868,12 @@ var CollectionController = class {
     if (!db) return c.json({ message: "Database not configured" }, 500);
     const provider = this.getDelegatedProvider(c);
     if (provider && provider.members?.delete) {
+      const hookReq = this.toHookRequestContext(c);
       const id2 = c.req.param("id");
       if (!id2) return c.json({ message: "Missing ID" }, 400);
       const localDoc = await db.findOne({ collection: this.collection.slug, id: id2 });
       const externalSubject = localDoc?.externalSubject || id2;
-      await provider.members.delete({ externalSubject, req: c.req });
+      await provider.members.delete({ externalSubject, req: hookReq });
       return c.json({ message: "Deleted" });
     }
     const readonlyDb = createReadonlyDb(db);
@@ -1735,8 +1769,9 @@ var AdminAuthController = class {
     this.config = config;
   }
   config;
-  providers(c) {
-    return c.json(getPublicAdminAuthConfig(this.config.adminAuth));
+  async providers(c) {
+    const requestConfig = await this.getRequestConfig(c);
+    return c.json(getPublicAdminAuthConfig(requestConfig.adminAuth, requestConfig.collections));
   }
   async start(c) {
     const requestConfig = await this.getRequestConfig(c);
@@ -2404,7 +2439,7 @@ function registerRoutes(app, config) {
       collections: filteredCollections,
       globals: filteredGlobals,
       admin: config.admin || {},
-      adminAuth: getPublicAdminAuthConfig(config.adminAuth)
+      adminAuth: getPublicAdminAuthConfig(config.adminAuth, collections)
     });
   });
   app.get("/api/dyrected/options/:collection/:field", optionalAuth(), async (c) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/core",
-  "version": "2.5.48",
+  "version": "2.5.51",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",