@nexpress/core 0.2.1 → 0.3.0

package/dist/index.d.ts

@@ -1,15 +1,15 @@
-import { c as NpConfig, d as NpCollectionConfig, e as NpAuthUser, f as NpSaveOptions, g as NpSaveResult, h as NpFindOptions, i as NpFindResult, j as NpFieldConfig, a as NpNavItem, k as NpRegisteredTheme, l as NpThemeFieldRequirement, m as NpThemeManifest, n as NpUserRole, o as NpPluginConfig } from './types-TlsbXS0T.js';
-export { p as NpAccessFunction, q as NpArrayField, r as NpBlockConfig, b as NpBlockInstance, s as NpBlocksField, t as NpCheckboxField, u as NpCollapsibleField, v as NpCollectionHook, w as NpDateField, x as NpDocumentStatus, y as NpEditorConfig, z as NpEmailField, A as NpFieldCondition, B as NpFieldValidator, C as NpFindWhere, D as NpFindWhereSystemTokens, E as NpGroupField, F as NpHookPrincipal, G as NpI18nConfig, H as NpImageSize, I as NpJobType, J as NpJsonField, K as NpNumberField, L as NpPluginContext, F as NpPrincipal, M as NpRadioField, O as NpRelationshipField, P as NpResolvedPluginLike, N as NpRichTextContent, Q as NpRichTextField, R as NpRowField, S as NpSelectField, T as NpTextField, U as NpTextareaField, V as NpThemeCollectionRequirement, W as NpUploadConfig, X as NpUploadField, Y as ROLE_HIERARCHY } from './types-TlsbXS0T.js';
+import { c as NpConfig, d as NpCollectionConfig, e as NpAuthUser, f as NpSaveOptions, g as NpSaveResult, h as NpFindOptions, i as NpFindResult, j as NpFieldConfig, a as NpNavItem, k as NpRegisteredTheme, l as NpThemeFieldRequirement, m as NpThemeManifest, n as NpUserRole, o as NpPluginConfig } from './types-DI3gxsiY.js';
+export { p as NpAccessFunction, q as NpArrayField, r as NpBlockConfig, b as NpBlockInstance, s as NpBlocksField, t as NpCheckboxField, u as NpCollapsibleField, v as NpCollectionHook, w as NpDateField, x as NpDocumentStatus, y as NpEditorConfig, z as NpEmailField, A as NpFieldCondition, B as NpFieldValidator, C as NpFindWhere, D as NpFindWhereSystemTokens, E as NpGroupField, F as NpHookPrincipal, G as NpI18nConfig, H as NpImageSize, I as NpJobType, J as NpJsonField, K as NpNumberField, L as NpPluginContext, F as NpPrincipal, M as NpRadioField, O as NpRelationshipField, P as NpResolvedPluginLike, N as NpRichTextContent, Q as NpRichTextField, R as NpRowField, S as NpSelectField, T as NpTextField, U as NpTextareaField, V as NpThemeCollectionRequirement, W as NpUploadConfig, X as NpUploadField, Y as ROLE_HIERARCHY } from './types-DI3gxsiY.js';
 export { ARGON2_OPTIONS, ArcticLikeProvider, ArcticLikeTokens, FromArcticOptions, IssuedOAuthState, NpCapability, NpConsumeMemberEmailVerifyResult, NpConsumeMemberResetResult, NpConsumeResetTokenOptions, NpConsumeResetTokenResult, NpCreateResetTokenOptions, NpIssuedMemberToken, NpIssuedResetToken, NpMemberAuthRow, NpMemberIdentityRow, NpMemberResetRequestResult, NpMemberTokenPayload, NpPasswordResetPurpose, NpResetRequestResult, NpTokenPayload, NpUserIdentityRow, OAuthAuthorizeParams, OAuthExchangeParams, OAuthProfile, OAuthProvider, OAuthStatePayload, ResolveMemberOAuthLoginInput, ResolveMemberOAuthLoginResult, ResolveOAuthLoginInput, ResolveOAuthLoginResult, ResolvedOAuthMember, ResolvedOAuthUser, VerifyOAuthStateResult, authenticated, can, consumeMemberEmailVerifyToken, consumeMemberPasswordReset, consumePasswordResetToken, createMemberEmailVerifyToken, createPasswordResetToken, fromArctic, getMemberFromTokenPayload, getOAuthProvider, hashPassword, invalidateAllMemberSessions, invalidateAllSessions, isAdmin, isEditorOrAbove, isOwnerOrAdmin, isTokenVerificationError, issueOAuthState, listMemberIdentities, listOAuthProviders, listUserIdentities, registerOAuthProvider, requestMemberPasswordReset, requestPasswordReset, resetOAuthProviders, resolveMemberOAuthLogin, resolveOAuthLogin, revokeMemberIdentity, revokeUserIdentity, sha256, signMemberToken, signToken, verifyCsrf, verifyMemberToken, verifyOAuthState, verifyPassword, verifyToken, verifyTokenFull } from './auth.js';
 import { SQL } from 'drizzle-orm';
 import { NpSitemapEntry, NpFeedEntry } from './seo.js';
 export { ArticleJsonLd, ArticleJsonLdInput, BuildAtomFeedOptions, BuildJsonLdContext, BuildSitemapOptions, DEFAULT_SITE_SEO_SETTINGS, DiscussionForumPostingJsonLd, NpPageMetadata, NpPageMetadataInput, NpSeoSettingsPatch, NpSiteSeoSettings, NpSitemapIndexEntry, PersonJsonLd, PersonJsonLdInput, WebSiteJsonLd, buildArticleJsonLd, buildAtomFeed, buildDiscussionForumPostingJsonLd, buildPageMetadata, buildPersonJsonLd, buildSitemap, buildWebSiteJsonLd, getSiteSeoSettings, renderAtomFeed, renderSitemapIndexXml, renderSitemapXml, validateSeoSettingsPatch } from './seo.js';
-export { c as createDbConnection, g as generateDocumentsModule, a as generateDrizzleSchema, b as generateTypeScript, d as getDb, s as setDb } from './index-XwP1ET8b.js';
+export { c as createDbConnection, g as generateDocumentsModule, a as generateDrizzleSchema, b as generateTypeScript, d as getDb, s as setDb } from './index-9IhVtFfA.js';
 import { z, ZodTypeAny } from 'zod';
-export { N as NP_GLOBAL_PLUGIN_SITE_ID, n as npAuditEvents, a as npBanKindEnum, b as npBanScopeEnum, c as npBans, d as npCommentStatusEnum, e as npComments, f as npFollows, g as npJobLogs, h as npMedia, i as npMediaFolders, j as npMediaFoldersRelations, k as npMediaRefs, l as npMediaRefsRelations, m as npMediaRelations, o as npMediaStatusEnum, p as npMemberIdentities, q as npMemberMutes, r as npMemberRoleScopeEnum, s as npMemberRoles, t as npMemberSessions, u as npMemberStatusEnum, v as npMembers, w as npNavigation, x as npNavigationRelations, y as npNotifications, z as npPasswordResetPurposeEnum, A as npPluginStorage, B as npPlugins, C as npReactions, D as npReports, E as npRevisionStatusEnum, F as npRevisions, G as npRevisionsRelations, H as npSessions, I as npSessionsRelations, J as npSettings, K as npSettingsRelations, L as npSiteMemberships, M as npSites, O as npSlugHistory, P as npStringOverrides, Q as npUserOAuthIdentities, R as npUserRoleEnum, S as npUsers, T as npUsersRelations, U as npWorkerHeartbeats } from './index-CY55LC0u.js';
-export { D as DEFAULT_JOB_LOG_RETENTION_MS, L as ListJobLogsOptions, N as NpJobCountOptions, a as NpJobHandler, b as NpJobListOptions, c as NpJobListResult, d as NpJobLogEntry, e as NpJobQueue, f as NpJobState, g as NpJobStateCounts, h as NpJobSummary, i as NpJobsPauseState, j as NpPluginScheduleStats, k as NpReconcileSchedulesResult, l as NpScheduleSummary, m as NpWorkerHealthSummary, n as NpWorkerHeartbeat, P as PAUSE_SYNC_INTERVAL_MS, o as PgBossAdapter, S as SetJobsPauseStateInput, W as WORKER_HEARTBEAT_INTERVAL_MS, p as WORKER_STALE_THRESHOLD_MS, q as configureBuiltinJobContext, r as countAliveWorkers, s as countJobLogs, t as enqueueJob, u as getAllJobHandlers, v as getCurrentJobId, w as getJobHandler, x as getJobQueue, y as getJobsPauseState, z as getOptionalJobQueue, A as listJobLogs, B as listWorkerHealth, C as markWorkerStopped, E as pruneJobLogsOlderThan, F as purgeStaleWorkers, G as recordHeartbeat, H as recordJobLog, I as registerBuiltinHandlers, J as registerJobHandler, K as runInJobContext, M as setJobQueue, O as setJobsPauseState, Q as startProducer, R as startWorker, T as stopProducer, U as stopWorker } from './index-B6-_vr_m.js';
-import { N as NpStorageAdapter, a as NpFileMetadata } from './index-CeiTvwbp.js';
-export { D as DEFAULT_IMAGE_SIZES, b as NpGetMediaUrlOptions, c as NpMediaUploader, d as NpMediaUploaderKindFilter, e as NpMediaVariantName, f as NpProcessedImageResult, g as NpProcessedImageVariant, h as cleanupDeletedMedia, i as deleteMedia, j as extractMediaIds, k as getMediaById, l as getMediaUrl, m as getStorageAdapter, n as listMedia, p as processImage, o as processMediaImage, s as setStorageAdapter, u as uploadMedia } from './index-CeiTvwbp.js';
+export { N as NP_GLOBAL_PLUGIN_SITE_ID, n as npAuditEvents, a as npBanKindEnum, b as npBanScopeEnum, c as npBans, d as npCommentStatusEnum, e as npComments, f as npFollows, g as npJobLogs, h as npMedia, i as npMediaFolders, j as npMediaFoldersRelations, k as npMediaRefs, l as npMediaRefsRelations, m as npMediaRelations, o as npMediaStatusEnum, p as npMemberIdentities, q as npMemberMutes, r as npMemberRoleScopeEnum, s as npMemberRoles, t as npMemberSessions, u as npMemberStatusEnum, v as npMembers, w as npNavigation, x as npNavigationRelations, y as npNotifications, z as npPasswordResetPurposeEnum, A as npPluginStorage, B as npPlugins, C as npReactions, D as npReports, E as npRevisionStatusEnum, F as npRevisions, G as npRevisionsRelations, H as npSessions, I as npSessionsRelations, J as npSettings, K as npSettingsRelations, L as npSiteMemberships, M as npSites, O as npSlugHistory, P as npStringOverrides, Q as npUserOAuthIdentities, R as npUserRoleEnum, S as npUsers, T as npUsersRelations, U as npWorkerHeartbeats } from './index-CXuqW_Gl.js';
+export { D as DEFAULT_JOB_LOG_RETENTION_MS, L as ListJobLogsOptions, N as NpJobCountOptions, a as NpJobHandler, b as NpJobListOptions, c as NpJobListResult, d as NpJobLogEntry, e as NpJobQueue, f as NpJobState, g as NpJobStateCounts, h as NpJobSummary, i as NpJobsPauseState, j as NpPluginScheduleStats, k as NpReconcileSchedulesResult, l as NpScheduleSummary, m as NpWorkerHealthSummary, n as NpWorkerHeartbeat, P as PAUSE_SYNC_INTERVAL_MS, o as PgBossAdapter, S as SetJobsPauseStateInput, W as WORKER_HEARTBEAT_INTERVAL_MS, p as WORKER_STALE_THRESHOLD_MS, q as configureBuiltinJobContext, r as countAliveWorkers, s as countJobLogs, t as enqueueJob, u as getAllJobHandlers, v as getCurrentJobId, w as getJobHandler, x as getJobQueue, y as getJobsPauseState, z as getOptionalJobQueue, A as listJobLogs, B as listWorkerHealth, C as markWorkerStopped, E as pruneJobLogsOlderThan, F as purgeStaleWorkers, G as recordHeartbeat, H as recordJobLog, I as registerBuiltinHandlers, J as registerJobHandler, K as runInJobContext, M as setJobQueue, O as setJobsPauseState, Q as startProducer, R as startWorker, T as stopProducer, U as stopWorker } from './index-7_PBSyOq.js';
+import { N as NpStorageAdapter, a as NpFileMetadata } from './index-ClcinJ29.js';
+export { D as DEFAULT_IMAGE_SIZES, b as NpGetMediaUrlOptions, c as NpMediaUploader, d as NpMediaUploaderKindFilter, e as NpMediaVariantName, f as NpProcessedImageResult, g as NpProcessedImageVariant, h as cleanupDeletedMedia, i as deleteMedia, j as extractMediaIds, k as getMediaById, l as getMediaUrl, m as getStorageAdapter, n as listMedia, p as processImage, o as processMediaImage, s as setStorageAdapter, u as uploadMedia } from './index-ClcinJ29.js';
 import { ReadableStream } from 'node:stream/web';
 export { NpLocaleDirection, NpResolveLocaleInput, NpResolveLocaleResult, NpStringOverrideRow, NpTranslationBundle, NpTranslationParams, addStrings, clearStringOverrideCacheForSite, deleteStringOverride, formatDate, formatNumber, formatRelativeTime, getAllStrings, getCurrentLocale, getI18nConfig, getLocaleDirection, getStringOverride, getStringOverridesForSite, getStrings, listStringOverridesForSite, loadStringOverridesForSite, resetI18nConfig, resetIntlFormatterCache, resetStringOverrideCache, resetStrings, resetTranslationCache, resolveLocale, setI18nConfig, setStringOverride, setStrings, t, tSync } from './i18n.js';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres';
@@ -38,6 +38,13 @@ import 'pg-boss';
  *
  * Unknown plugin entries are accepted here — the plugin loader does the
  * deeper validation of manifests against @nexpress/plugin-sdk.
+ *
+ * After validation, theme requirements are auto-merged into the
+ * `collections` array via `mergeThemeRequirements`. Operators no
+ * longer need to AST-patch `src/collections/*.ts` when adopting a
+ * theme — adding the theme to `themes: [...]` is enough; the next
+ * `pnpm db:generate && pnpm db:migrate` picks up the new
+ * theme-declared columns.
  */
 declare function defineConfig(config: NpConfig): NpConfig;
 
@@ -1050,6 +1057,25 @@ interface NpThemeRequirementResult {
 }
 declare function checkThemeRequirements(manifest: NpThemeManifest, collections: NpCollectionConfig[]): NpThemeRequirementResult;
 
+/**
+ * Walks every theme on `themes` and unions its
+ * `manifest.requires.collections` into `collections`. Returns a
+ * NEW array (and new nested objects where modified) so the
+ * function is safe to feed a frozen / re-used config object.
+ *
+ * Conflict resolution:
+ *   - Operator-declared field with the same name → keep the
+ *     operator's; do NOT overwrite.
+ *   - Two themes contribute the same field name on the same
+ *     slug → first theme wins, subsequent themes log a
+ *     `config:theme-merge` warning and skip.
+ *   - Theme declares a slug that doesn't exist and DOESN'T set
+ *     `createIfAbsent` → no-op (admin still surfaces the
+ *     mismatch via `checkThemeRequirements` so the operator can
+ *     decide whether to add the collection manually).
+ */
+declare function mergeThemeRequirements(collections: NpCollectionConfig[], themes: NpRegisteredTheme[] | undefined): NpCollectionConfig[];
+
 /**
  * Read the persisted settings row for a theme and parse it via
  * the theme's schema. Returns the parsed value when valid;
@@ -2034,4 +2060,4 @@ declare function checkNexpressCompat(manifest: {
     };
 }, framework?: string): NexpressCompatResult;
 
-export { type CreateSiteInput, DEFAULT_THEME, LocalStorageAdapter, NP_DEFAULT_SITE_ID, type NexpressCompatResult, NoopEmailAdapter, NpAuthError, NpAuthUser, NpCollectionConfig, type NpCollectionTranslationProgress, NpConfig, NpConflictError, type NpDeleteSiteOptions, type NpEmailAdapter, type NpEmailMessage, type NpEmailTemplate, NpError, type NpErrorCode, type NpErrorCodeInput, NpFeedEntry, NpFieldConfig, NpFileMetadata, NpFindOptions, NpFindResult, NpForbiddenError, type NpListPendingDocsOptions, type NpListPendingDocsResult, NpNavItem, NpNotFoundError, type NpPasswordResetTemplateData, type NpPendingDocSummary, NpPluginConfig, type NpPluginConfigResult, type NpPluginState, type NpPluginStateUpdate, NpRateLimitError, NpRegisteredTheme, type NpRevision, type NpRevisionListOptions, type NpRevisionListResult, type NpRevisionStatus, type NpRevisionSummary, NpSaveOptions, NpSaveResult, type NpSearchAdapter, type NpSearchAdapterContext, type NpSearchVectorParts, type NpSite, NpSiteContextMissingError, type NpSiteUsage, NpSitemapEntry, NpStorageAdapter, type NpThemeColors, NpThemeFieldRequirement, NpThemeManifest, type NpThemeNavLocationDescriptor, type NpThemeRequirementMissingField, type NpThemeRequirementRelationConflict, type NpThemeRequirementResult, type NpThemeRequirementTypeConflict, type NpThemeSeoHooksExtracted, type NpThemeSettingsArrayField, type NpThemeSettingsBooleanField, type NpThemeSettingsColorField, type NpThemeSettingsEnumField, type NpThemeSettingsField, type NpThemeSettingsNumberField, type NpThemeSettingsObjectField, type NpThemeSettingsResult, type NpThemeSettingsTextField, type NpThemeSettingsTextareaField, type NpThemeSettingsUnsupportedField, type NpThemeSettingsUrlField, type NpThemeShape, type NpThemeTemplateSummary, type NpThemeTokens, type NpThemeTokensOverlay, type NpThemeTypography, type NpTranslationProgress, type NpTranslationProgressLocaleStats, NpUserRole, NpValidationError, type PluginAdminExtension, type PluginHookHandler, type PluginPageRouteEntry, type PluginRouteHandler, type PluginRouteRequest, type PluginRouteResponse, type PublishScheduledResult, type ReindexResult, type ResolvedCollectionTab, type ResolvedDashboardWidget, S3StorageAdapter, type SearchCollectionsOptions, type SearchResult, type SearchResultItem, type SiteMembership, SmtpEmailAdapter, type SmtpEmailAdapterOptions, activeThemeContributesSeo, autosaveRevision, buildInviteEmail, buildResetEmail, buildSearchVector, buildSearchVectorParts, buildWeightedSearchVectorSql, buildZodSchema, checkNexpressCompat, checkThemeRequirements, collectionConfigSchema, compareSemver, createMemberDocument, createSite, createStorageAdapter, createTranslation, defineCollection, defineConfig, deleteDocument, deleteMemberDocument, deleteSite, dispatchPluginAction, ensureDefaultSite, extractErrorComponent, extractMembersNotFoundComponent, extractNotFoundComponent, extractSeoHooks, findDocuments, findPosts, findSlugRedirect, findTranslations, getActiveTheme, getActiveThemeError, getActiveThemeId, getActiveThemeMembersNotFound, getActiveThemeNavLocations, getActiveThemeNotFound, getActiveThemeSeoHooks, getAllCollectionSlugs, getAllPageSlugs, getAllPluginIds, getCollectionConfig, getCollectionRegistration, getCollectionTable, getCollectionTabsForSlug, getCollectionZodSchema, getCurrentSiteId, getDashboardWidgetsFromPlugins, getDefaultSite, getDocumentById, getEmailAdapter, getFrameworkVersion, getMembership, getNavigation, getPageBySlug, getPluginAdminExtension, getPluginConfig, getPluginConfigWithStatus, getPluginPageRoutes, getPluginRegistration, getPluginRoutes, getPluginState, getPluginTemplatesForCollection, getPostBySlug, getRegisteredPluginSchedules, getRegisteredThemes, getRevision, getSearchAdapter, getSetting, getSiteByHostname, getSiteById, getSiteUsageSummary, getTheme, getThemeById, getThemeSettings, getThemeSettingsWithStatus, getThemeTemplateSummaries, getTranslationProgress, grantSiteMembership, hasRoleOnSite, introspectThemeSettingsSchema, invalidatePluginEnabled, isPluginEnabled, isSuperAdmin, listMembershipsForUser, listPendingMemberDocs, listPluginStates, listRevisions, listSiteMemberships, listSites, loadPlugins, npConfigSchema, pluginConfigCacheTag, promoteMemberDocument, publishScheduledDocuments, registerCollection, registerPluginTemplates, registerThemes, reindexCollection, resetCurrentSiteResolver, resetEmailAdapter, resetPluginTemplates, resetPlugins, resetSearchAdapter, resetThemes, resolveSiteForHostname, resolveTemplateComponent, resolveUserRoleOnSite, restoreRevision, revokeSiteMembership, runHook, runHookAndCollect, runPluginScheduledTask, sanitizeTokenValue, saveDocument, schedulePluginTask, searchCollections, setActiveThemeId, setCurrentSiteResolver, setEmailAdapter, setPluginConfig, setSearchAdapter, setSuperAdmin, setThemeSettings, syncPluginRegistrations, updateMemberDocument, updatePluginState, updateSite, withCurrentSite };
+export { type CreateSiteInput, DEFAULT_THEME, LocalStorageAdapter, NP_DEFAULT_SITE_ID, type NexpressCompatResult, NoopEmailAdapter, NpAuthError, NpAuthUser, NpCollectionConfig, type NpCollectionTranslationProgress, NpConfig, NpConflictError, type NpDeleteSiteOptions, type NpEmailAdapter, type NpEmailMessage, type NpEmailTemplate, NpError, type NpErrorCode, type NpErrorCodeInput, NpFeedEntry, NpFieldConfig, NpFileMetadata, NpFindOptions, NpFindResult, NpForbiddenError, type NpListPendingDocsOptions, type NpListPendingDocsResult, NpNavItem, NpNotFoundError, type NpPasswordResetTemplateData, type NpPendingDocSummary, NpPluginConfig, type NpPluginConfigResult, type NpPluginState, type NpPluginStateUpdate, NpRateLimitError, NpRegisteredTheme, type NpRevision, type NpRevisionListOptions, type NpRevisionListResult, type NpRevisionStatus, type NpRevisionSummary, NpSaveOptions, NpSaveResult, type NpSearchAdapter, type NpSearchAdapterContext, type NpSearchVectorParts, type NpSite, NpSiteContextMissingError, type NpSiteUsage, NpSitemapEntry, NpStorageAdapter, type NpThemeColors, NpThemeFieldRequirement, NpThemeManifest, type NpThemeNavLocationDescriptor, type NpThemeRequirementMissingField, type NpThemeRequirementRelationConflict, type NpThemeRequirementResult, type NpThemeRequirementTypeConflict, type NpThemeSeoHooksExtracted, type NpThemeSettingsArrayField, type NpThemeSettingsBooleanField, type NpThemeSettingsColorField, type NpThemeSettingsEnumField, type NpThemeSettingsField, type NpThemeSettingsNumberField, type NpThemeSettingsObjectField, type NpThemeSettingsResult, type NpThemeSettingsTextField, type NpThemeSettingsTextareaField, type NpThemeSettingsUnsupportedField, type NpThemeSettingsUrlField, type NpThemeShape, type NpThemeTemplateSummary, type NpThemeTokens, type NpThemeTokensOverlay, type NpThemeTypography, type NpTranslationProgress, type NpTranslationProgressLocaleStats, NpUserRole, NpValidationError, type PluginAdminExtension, type PluginHookHandler, type PluginPageRouteEntry, type PluginRouteHandler, type PluginRouteRequest, type PluginRouteResponse, type PublishScheduledResult, type ReindexResult, type ResolvedCollectionTab, type ResolvedDashboardWidget, S3StorageAdapter, type SearchCollectionsOptions, type SearchResult, type SearchResultItem, type SiteMembership, SmtpEmailAdapter, type SmtpEmailAdapterOptions, activeThemeContributesSeo, autosaveRevision, buildInviteEmail, buildResetEmail, buildSearchVector, buildSearchVectorParts, buildWeightedSearchVectorSql, buildZodSchema, checkNexpressCompat, checkThemeRequirements, collectionConfigSchema, compareSemver, createMemberDocument, createSite, createStorageAdapter, createTranslation, defineCollection, defineConfig, deleteDocument, deleteMemberDocument, deleteSite, dispatchPluginAction, ensureDefaultSite, extractErrorComponent, extractMembersNotFoundComponent, extractNotFoundComponent, extractSeoHooks, findDocuments, findPosts, findSlugRedirect, findTranslations, getActiveTheme, getActiveThemeError, getActiveThemeId, getActiveThemeMembersNotFound, getActiveThemeNavLocations, getActiveThemeNotFound, getActiveThemeSeoHooks, getAllCollectionSlugs, getAllPageSlugs, getAllPluginIds, getCollectionConfig, getCollectionRegistration, getCollectionTable, getCollectionTabsForSlug, getCollectionZodSchema, getCurrentSiteId, getDashboardWidgetsFromPlugins, getDefaultSite, getDocumentById, getEmailAdapter, getFrameworkVersion, getMembership, getNavigation, getPageBySlug, getPluginAdminExtension, getPluginConfig, getPluginConfigWithStatus, getPluginPageRoutes, getPluginRegistration, getPluginRoutes, getPluginState, getPluginTemplatesForCollection, getPostBySlug, getRegisteredPluginSchedules, getRegisteredThemes, getRevision, getSearchAdapter, getSetting, getSiteByHostname, getSiteById, getSiteUsageSummary, getTheme, getThemeById, getThemeSettings, getThemeSettingsWithStatus, getThemeTemplateSummaries, getTranslationProgress, grantSiteMembership, hasRoleOnSite, introspectThemeSettingsSchema, invalidatePluginEnabled, isPluginEnabled, isSuperAdmin, listMembershipsForUser, listPendingMemberDocs, listPluginStates, listRevisions, listSiteMemberships, listSites, loadPlugins, mergeThemeRequirements, npConfigSchema, pluginConfigCacheTag, promoteMemberDocument, publishScheduledDocuments, registerCollection, registerPluginTemplates, registerThemes, reindexCollection, resetCurrentSiteResolver, resetEmailAdapter, resetPluginTemplates, resetPlugins, resetSearchAdapter, resetThemes, resolveSiteForHostname, resolveTemplateComponent, resolveUserRoleOnSite, restoreRevision, revokeSiteMembership, runHook, runHookAndCollect, runPluginScheduledTask, sanitizeTokenValue, saveDocument, schedulePluginTask, searchCollections, setActiveThemeId, setCurrentSiteResolver, setEmailAdapter, setPluginConfig, setSearchAdapter, setSuperAdmin, setThemeSettings, syncPluginRegistrations, updateMemberDocument, updatePluginState, updateSite, withCurrentSite };

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   introspectThemeSettingsSchema,
   pluginConfigCacheTag,
   setPluginConfig
-} from "./chunk-RRYDSZXG.js";
+} from "./chunk-EVOBLRHW.js";
 import {
   getPluginTemplatesForCollection,
   registerPluginTemplates,
@@ -12,7 +12,7 @@ import {
 } from "./chunk-CRUQBZUF.js";
 import {
   verifyStartupSafety
-} from "./chunk-2YDGE7YX.js";
+} from "./chunk-B7DTNT4O.js";
 import {
   InMemoryRateLimiter,
   getOptionalRateLimiter,
@@ -38,7 +38,7 @@ import {
   renderSitemapIndexXml,
   renderSitemapXml,
   validateSeoSettingsPatch
-} from "./chunk-RNR7KISG.js";
+} from "./chunk-DPRBHEHI.js";
 import {
   ARGON2_OPTIONS,
   authenticated,
@@ -78,7 +78,7 @@ import {
   verifyPassword,
   verifyToken,
   verifyTokenFull
-} from "./chunk-OK5HOCQI.js";
+} from "./chunk-QYP6E5FP.js";
 import {
   DEFAULT_REACTION_KINDS,
   addReaction,
@@ -126,18 +126,18 @@ import {
   unfollow,
   unresolvedReportCount,
   updateComment
-} from "./chunk-2GWRIV3W.js";
+} from "./chunk-TD4KNSEP.js";
 import {
   buildDigestEmail,
   runDigestSweep
-} from "./chunk-VNIHXQ7W.js";
+} from "./chunk-LN6NTH6E.js";
 import {
   getMutedTargetIds,
   isMuted,
   listMutes,
   muteMember,
   unmuteMember
-} from "./chunk-NUCGHWCF.js";
+} from "./chunk-CKT4QZDC.js";
 import {
   getMemberNotificationPrefs,
   isNotificationKindEnabled,
@@ -145,7 +145,7 @@ import {
   recordDigestSent,
   registerNotificationKind,
   setMemberNotificationPrefs
-} from "./chunk-CTSQ7BRI.js";
+} from "./chunk-CAS4Z6IN.js";
 import {
   MENTION_HANDLE_RE,
   assertOwnsNotification,
@@ -159,13 +159,13 @@ import {
   markNotificationsRead,
   resolveMentionedMembers,
   unreadNotificationCount
-} from "./chunk-UGQSQO5B.js";
+} from "./chunk-HM46WM45.js";
 import {
   applyReputation,
   getReputationAdapter,
   resetReputationAdapter,
   setReputationAdapter
-} from "./chunk-THX3SHYA.js";
+} from "./chunk-L6VG7IK6.js";
 import {
   getSpamAdapter,
   resetSpamAdapter,
@@ -178,7 +178,7 @@ import {
 } from "./chunk-KU5M27ZC.js";
 import {
   publishScheduledDocuments
-} from "./chunk-CYCRYBLX.js";
+} from "./chunk-4EPNN4XG.js";
 import {
   assertNotBanned,
   getCommunityRole,
@@ -187,7 +187,7 @@ import {
   registerCommunityRole,
   resetCommunityRoles,
   withMemberWrite
-} from "./chunk-55FU6WED.js";
+} from "./chunk-PQBJWZ7D.js";
 import {
   autosaveRevision,
   buildSearchVector,
@@ -223,26 +223,26 @@ import {
   saveDocument,
   schedulePluginTask,
   updateMemberDocument
-} from "./chunk-2M4DQNHX.js";
+} from "./chunk-HTDDXBMY.js";
 import {
   can
 } from "./chunk-EQ2Z3KMD.js";
 import {
   listAuditEvents,
   recordAuditEvent
-} from "./chunk-RIPHIRPP.js";
+} from "./chunk-ML2E3P3X.js";
 import {
   DEFAULT_COMMUNITY_SETTINGS,
   getCommunitySettings,
   updateCommunitySettings,
   validateCommunitySettingsPatch
-} from "./chunk-PPBWRKO2.js";
+} from "./chunk-74CGJJDY.js";
 import {
   createDbConnection,
   generateDocumentsModule,
   generateDrizzleSchema,
   generateTypeScript
-} from "./chunk-TFJ4MKPH.js";
+} from "./chunk-26RYBFTF.js";
 import {
   npMediaFoldersRelations,
   npMediaRefsRelations,
@@ -252,7 +252,7 @@ import {
   npSessionsRelations,
   npSettingsRelations,
   npUsersRelations
-} from "./chunk-PPAS4SZR.js";
+} from "./chunk-2KNG5KMM.js";
 import {
   formatDate,
   formatNumber,
@@ -279,7 +279,7 @@ import {
   setStrings,
   t,
   tSync
-} from "./chunk-QVJ2HCAX.js";
+} from "./chunk-ELK6AVW5.js";
 import {
   getI18nConfig,
   resetI18nConfig,
@@ -302,13 +302,7 @@ import {
   registerCollection,
   resolveSiteForHostname,
   updateSite
-} from "./chunk-FZ7O6DWI.js";
-import {
-  getCurrentSiteId,
-  resetCurrentSiteResolver,
-  setCurrentSiteResolver,
-  withCurrentSite
-} from "./chunk-SBCVAC2Z.js";
+} from "./chunk-U4QCCLAW.js";
 import {
   NpAuthError,
   NpConflictError,
@@ -319,6 +313,12 @@ import {
   NpSiteContextMissingError,
   NpValidationError
 } from "./chunk-ZCINJSS4.js";
+import {
+  getCurrentSiteId,
+  resetCurrentSiteResolver,
+  setCurrentSiteResolver,
+  withCurrentSite
+} from "./chunk-SBCVAC2Z.js";
 import {
   PAUSE_SYNC_INTERVAL_MS,
   PgBossAdapter,
@@ -342,7 +342,7 @@ import {
   startWorker,
   stopProducer,
   stopWorker
-} from "./chunk-XX4GLFD6.js";
+} from "./chunk-QSJIKNQJ.js";
 import {
   DEFAULT_JOB_LOG_RETENTION_MS,
   countJobLogs,
@@ -351,7 +351,7 @@ import {
   pruneJobLogsOlderThan,
   recordJobLog,
   runInJobContext
-} from "./chunk-DK2JBJH7.js";
+} from "./chunk-QBIJZZ5V.js";
 import {
   NoopEmailAdapter,
   getEmailAdapter,
@@ -367,10 +367,10 @@ import {
 } from "./chunk-WV272MPW.js";
 import {
   extractMediaIds
-} from "./chunk-S27S42QY.js";
+} from "./chunk-TETTWT56.js";
 import {
   getMediaUrl
-} from "./chunk-BHK3AD3Q.js";
+} from "./chunk-CHQJG4BB.js";
 import {
   DEFAULT_IMAGE_SIZES,
   cleanupDeletedMedia,
@@ -382,7 +382,7 @@ import {
   processMediaImage,
   setStorageAdapter,
   uploadMedia
-} from "./chunk-473S4TER.js";
+} from "./chunk-DWG3RZH2.js";
 import {
   enqueueJob,
   getJobQueue,
@@ -396,7 +396,7 @@ import {
   getScopedLogger,
   resetLogger,
   setLogger
-} from "./chunk-JJL74ZPK.js";
+} from "./chunk-NFHS7CFV.js";
 import {
   getDb,
   setDb
@@ -441,7 +441,7 @@ import {
   npUserRoleEnum,
   npUsers,
   npWorkerHeartbeats
-} from "./chunk-M43PGOQY.js";
+} from "./chunk-X7K5F2UI.js";
 import "./chunk-PZ5AY32C.js";
 
 // src/config/types.ts
@@ -456,6 +456,194 @@ var ROLE_HIERARCHY = {
 // src/config/define-config.ts
 import { ZodError } from "zod";
 
+// src/themes/merge-requirements.ts
+function log() {
+  return getScopedLogger({ component: "config:theme-merge" });
+}
+var SUPPORTED_REQUIREMENT_TYPES = /* @__PURE__ */ new Set([
+  "text",
+  "textarea",
+  "richText",
+  "number",
+  "checkbox",
+  "date",
+  "upload",
+  "relationship",
+  "blocks"
+]);
+function requirementToField(name, req) {
+  switch (req.type) {
+    case "text":
+    case "textarea":
+    case "richText":
+    case "number":
+    case "checkbox":
+    case "date":
+    case "blocks":
+      return { type: req.type, name };
+    case "upload": {
+      if (!req.relationTo || Array.isArray(req.relationTo)) {
+        log().warn(
+          "Skipping theme-required upload field: requirement is missing a scalar `relationTo`.",
+          { field: name, relationTo: req.relationTo }
+        );
+        return null;
+      }
+      return {
+        type: "upload",
+        name,
+        relationTo: req.relationTo
+      };
+    }
+    case "relationship": {
+      if (!req.relationTo) {
+        log().warn(
+          "Skipping theme-required relationship field: requirement is missing `relationTo`.",
+          { field: name }
+        );
+        return null;
+      }
+      const baseField = {
+        type: "relationship",
+        name,
+        relationTo: req.relationTo
+      };
+      return req.hasMany ? { ...baseField, hasMany: true } : baseField;
+    }
+    case "select":
+      log().warn(
+        "Skipping theme-required select field: cannot synthesise without an options list.",
+        { field: name }
+      );
+      return null;
+    default: {
+      const _exhaustive = req.type;
+      void _exhaustive;
+      log().warn("Unknown theme field requirement type; skipping.", {
+        field: name,
+        type: req.type
+      });
+      return null;
+    }
+  }
+}
+function collectExistingFieldNames(fields) {
+  const names = /* @__PURE__ */ new Set();
+  for (const f of fields) {
+    if (f.type === "row" || f.type === "collapsible") {
+      for (const name of collectExistingFieldNames(f.fields)) {
+        names.add(name);
+      }
+      continue;
+    }
+    if ("name" in f && typeof f.name === "string") {
+      names.add(f.name);
+    }
+  }
+  return names;
+}
+function titleCase(s) {
+  return s.replace(/[-_]+/g, " ").replace(/\b\w/g, (ch) => ch.toUpperCase());
+}
+function synthesiseCollection(slug, requirement, injectedNames, themeId) {
+  const fields = [];
+  for (const [fieldName, fieldReq] of Object.entries(requirement.fields ?? {})) {
+    if (!SUPPORTED_REQUIREMENT_TYPES.has(fieldReq.type)) {
+      const synth2 = requirementToField(fieldName, fieldReq);
+      if (synth2) fields.push(synth2);
+      continue;
+    }
+    const synth = requirementToField(fieldName, fieldReq);
+    if (synth) {
+      fields.push(synth);
+      injectedNames.add(fieldName);
+    }
+  }
+  if (fields.length === 0) {
+    log().warn(
+      "Theme requested createIfAbsent for a collection with no synthesisable fields; skipping.",
+      { slug }
+    );
+    return null;
+  }
+  const titled = titleCase(slug);
+  const singular = slug.endsWith("s") ? titleCase(slug.slice(0, -1)) : titled;
+  return {
+    slug,
+    labels: { singular, plural: titled },
+    fields,
+    admin: { _themeOrigin: themeId }
+  };
+}
+function mergeThemeRequirements(collections, themes) {
+  if (!themes || themes.length === 0) return collections;
+  const stats = {
+    injected: /* @__PURE__ */ new Map(),
+    createdSlugs: /* @__PURE__ */ new Set()
+  };
+  const merged = collections.slice();
+  const indexBySlug = new Map(
+    merged.map((c, i) => [c.slug, i])
+  );
+  const existingFieldsBySlug = new Map(
+    merged.map((c) => [c.slug, collectExistingFieldNames(c.fields)])
+  );
+  for (const theme of themes) {
+    const requires = theme.manifest.requires?.collections;
+    if (!requires) continue;
+    for (const [slug, req] of Object.entries(requires)) {
+      const existingIndex = indexBySlug.get(slug);
+      if (existingIndex === void 0) {
+        if (!req.createIfAbsent) continue;
+        const injectedNames = /* @__PURE__ */ new Set();
+        const synth = synthesiseCollection(slug, req, injectedNames, theme.manifest.id);
+        if (!synth) continue;
+        merged.push(synth);
+        indexBySlug.set(slug, merged.length - 1);
+        existingFieldsBySlug.set(slug, injectedNames);
+        stats.createdSlugs.add(slug);
+        stats.injected.set(slug, injectedNames);
+        continue;
+      }
+      const reqFields = req.fields;
+      if (!reqFields) continue;
+      const alreadyDeclared = existingFieldsBySlug.get(slug) ?? /* @__PURE__ */ new Set();
+      const toAdd = [];
+      for (const [fieldName, fieldReq] of Object.entries(reqFields)) {
+        if (alreadyDeclared.has(fieldName)) {
+          const injectedHere2 = stats.injected.get(slug);
+          if (injectedHere2?.has(fieldName)) {
+            log().warn(
+              "Two themes contribute the same field on the same collection; keeping the first.",
+              { slug, field: fieldName, theme: theme.manifest.id }
+            );
+          }
+          continue;
+        }
+        const synth = requirementToField(fieldName, fieldReq);
+        if (!synth) continue;
+        toAdd.push(synth);
+        alreadyDeclared.add(fieldName);
+        let injectedHere = stats.injected.get(slug);
+        if (!injectedHere) {
+          injectedHere = /* @__PURE__ */ new Set();
+          stats.injected.set(slug, injectedHere);
+        }
+        injectedHere.add(fieldName);
+      }
+      if (toAdd.length === 0) continue;
+      const target = merged[existingIndex];
+      if (!target) continue;
+      merged[existingIndex] = {
+        ...target,
+        fields: [...target.fields, ...toAdd]
+      };
+      existingFieldsBySlug.set(slug, alreadyDeclared);
+    }
+  }
+  return merged;
+}
+
 // src/config/validation.ts
 import { z } from "zod";
 var functionSchema = z.custom(
@@ -727,7 +915,11 @@ function defineConfig(config) {
       );
     }
   }
-  return config;
+  const mergedCollections = mergeThemeRequirements(config.collections, config.themes);
+  if (mergedCollections === config.collections) {
+    return config;
+  }
+  return { ...config, collections: mergedCollections };
 }
 var FRIENDLY_HINTS = {
   "auth.secret": "Set `NP_SECRET` in `.env` (\u226532 random chars) \u2014 `pnpm run setup` will generate one for you.",
@@ -2024,6 +2216,7 @@ export {
   markNotificationsRead,
   markWorkerStopped,
   memberCan,
+  mergeThemeRequirements,
   muteMember,
   noopErrorReporter,
   npAuditEvents,