@nexpress/core 0.3.0 → 0.3.2

package/dist/index.js

@@ -4,12 +4,15 @@ import {
   introspectThemeSettingsSchema,
   pluginConfigCacheTag,
   setPluginConfig
-} from "./chunk-EVOBLRHW.js";
+} from "./chunk-M2FWG5OJ.js";
 import {
   getPluginTemplatesForCollection,
   registerPluginTemplates,
   resetPluginTemplates
 } from "./chunk-CRUQBZUF.js";
+import {
+  extractMediaIds
+} from "./chunk-TETTWT56.js";
 import {
   verifyStartupSafety
 } from "./chunk-B7DTNT4O.js";
@@ -38,7 +41,7 @@ import {
   renderSitemapIndexXml,
   renderSitemapXml,
   validateSeoSettingsPatch
-} from "./chunk-DPRBHEHI.js";
+} from "./chunk-YOFCLTBR.js";
 import {
   ARGON2_OPTIONS,
   authenticated,
@@ -50,6 +53,7 @@ import {
   fromArctic,
   getMemberFromTokenPayload,
   getOAuthProvider,
+  getUserById,
   hashPassword,
   invalidateAllMemberSessions,
   invalidateAllSessions,
@@ -78,7 +82,7 @@ import {
   verifyPassword,
   verifyToken,
   verifyTokenFull
-} from "./chunk-QYP6E5FP.js";
+} from "./chunk-6UV2P5MW.js";
 import {
   DEFAULT_REACTION_KINDS,
   addReaction,
@@ -126,18 +130,30 @@ import {
   unfollow,
   unresolvedReportCount,
   updateComment
-} from "./chunk-TD4KNSEP.js";
+} from "./chunk-C6HXDY46.js";
+import {
+  publishScheduledDocuments
+} from "./chunk-54KUQF3S.js";
 import {
   buildDigestEmail,
   runDigestSweep
 } from "./chunk-LN6NTH6E.js";
+import {
+  assertNotBanned,
+  getCommunityRole,
+  listCommunityRoles,
+  memberCan,
+  registerCommunityRole,
+  resetCommunityRoles,
+  withMemberWrite
+} from "./chunk-RJ76SKWQ.js";
 import {
   getMutedTargetIds,
   isMuted,
   listMutes,
   muteMember,
   unmuteMember
-} from "./chunk-CKT4QZDC.js";
+} from "./chunk-WJJ5MBH5.js";
 import {
   getMemberNotificationPrefs,
   isNotificationKindEnabled,
@@ -159,7 +175,7 @@ import {
   markNotificationsRead,
   resolveMentionedMembers,
   unreadNotificationCount
-} from "./chunk-HM46WM45.js";
+} from "./chunk-RDTTK27V.js";
 import {
   applyReputation,
   getReputationAdapter,
@@ -177,23 +193,13 @@ import {
   setProfanityAdapter
 } from "./chunk-KU5M27ZC.js";
 import {
-  publishScheduledDocuments
-} from "./chunk-4EPNN4XG.js";
-import {
-  assertNotBanned,
-  getCommunityRole,
-  listCommunityRoles,
-  memberCan,
-  registerCommunityRole,
-  resetCommunityRoles,
-  withMemberWrite
-} from "./chunk-PQBJWZ7D.js";
+  getMediaUrl
+} from "./chunk-2N53KKIL.js";
 import {
   autosaveRevision,
   buildSearchVector,
   buildSearchVectorParts,
   buildWeightedSearchVectorSql,
-  buildZodSchema,
   checkNexpressCompat,
   compareSemver,
   createMemberDocument,
@@ -203,7 +209,6 @@ import {
   findDocuments,
   getAllPluginIds,
   getCollectionTabsForSlug,
-  getCollectionZodSchema,
   getDashboardWidgetsFromPlugins,
   getDocumentById,
   getFrameworkVersion,
@@ -222,8 +227,21 @@ import {
   runPluginScheduledTask,
   saveDocument,
   schedulePluginTask,
-  updateMemberDocument
-} from "./chunk-HTDDXBMY.js";
+  updateMemberDocument,
+  withDeferredPostCommit
+} from "./chunk-ZA3IRJUQ.js";
+import {
+  DEFAULT_IMAGE_SIZES,
+  cleanupDeletedMedia,
+  deleteMedia,
+  getMediaById,
+  getStorageAdapter,
+  listMedia,
+  processImage,
+  processMediaImage,
+  setStorageAdapter,
+  uploadMedia
+} from "./chunk-2VZZ7M26.js";
 import {
   can
 } from "./chunk-EQ2Z3KMD.js";
@@ -236,13 +254,13 @@ import {
   getCommunitySettings,
   updateCommunitySettings,
   validateCommunitySettingsPatch
-} from "./chunk-74CGJJDY.js";
+} from "./chunk-RKM4GDWM.js";
 import {
   createDbConnection,
   generateDocumentsModule,
   generateDrizzleSchema,
   generateTypeScript
-} from "./chunk-26RYBFTF.js";
+} from "./chunk-LMPYQLMH.js";
 import {
   npMediaFoldersRelations,
   npMediaRefsRelations,
@@ -253,6 +271,12 @@ import {
   npSettingsRelations,
   npUsersRelations
 } from "./chunk-2KNG5KMM.js";
+import {
+  buildZodSchema,
+  collectHiddenFieldNames,
+  evaluateFieldCondition,
+  getCollectionZodSchema
+} from "./chunk-P5WGQRSG.js";
 import {
   formatDate,
   formatNumber,
@@ -303,6 +327,12 @@ import {
   resolveSiteForHostname,
   updateSite
 } from "./chunk-U4QCCLAW.js";
+import {
+  getCurrentSiteId,
+  resetCurrentSiteResolver,
+  setCurrentSiteResolver,
+  withCurrentSite
+} from "./chunk-SBCVAC2Z.js";
 import {
   NpAuthError,
   NpConflictError,
@@ -313,12 +343,6 @@ import {
   NpSiteContextMissingError,
   NpValidationError
 } from "./chunk-ZCINJSS4.js";
-import {
-  getCurrentSiteId,
-  resetCurrentSiteResolver,
-  setCurrentSiteResolver,
-  withCurrentSite
-} from "./chunk-SBCVAC2Z.js";
 import {
   PAUSE_SYNC_INTERVAL_MS,
   PgBossAdapter,
@@ -342,7 +366,7 @@ import {
   startWorker,
   stopProducer,
   stopWorker
-} from "./chunk-QSJIKNQJ.js";
+} from "./chunk-ANZBCOEH.js";
 import {
   DEFAULT_JOB_LOG_RETENTION_MS,
   countJobLogs,
@@ -358,6 +382,12 @@ import {
   resetEmailAdapter,
   setEmailAdapter
 } from "./chunk-LSHHRDVR.js";
+import {
+  enqueueJob,
+  getJobQueue,
+  getOptionalJobQueue,
+  setJobQueue
+} from "./chunk-V2UNHGAP.js";
 import {
   getErrorReporter,
   noopErrorReporter,
@@ -365,30 +395,6 @@ import {
   resetErrorReporter,
   setErrorReporter
 } from "./chunk-WV272MPW.js";
-import {
-  extractMediaIds
-} from "./chunk-TETTWT56.js";
-import {
-  getMediaUrl
-} from "./chunk-CHQJG4BB.js";
-import {
-  DEFAULT_IMAGE_SIZES,
-  cleanupDeletedMedia,
-  deleteMedia,
-  getMediaById,
-  getStorageAdapter,
-  listMedia,
-  processImage,
-  processMediaImage,
-  setStorageAdapter,
-  uploadMedia
-} from "./chunk-DWG3RZH2.js";
-import {
-  enqueueJob,
-  getJobQueue,
-  getOptionalJobQueue,
-  setJobQueue
-} from "./chunk-V2UNHGAP.js";
 import "./chunk-OROPGO65.js";
 import {
   consoleLogger,
@@ -471,7 +477,15 @@ var SUPPORTED_REQUIREMENT_TYPES = /* @__PURE__ */ new Set([
   "relationship",
   "blocks"
 ]);
-function requirementToField(name, req) {
+function buildAdminSlot(req, themeId) {
+  const out = { _themeOrigin: themeId };
+  if (req.admin?.group !== void 0) out.group = req.admin.group;
+  if (req.admin?.condition !== void 0) out.condition = req.admin.condition;
+  if (req.admin?.position !== void 0) out.position = req.admin.position;
+  return out;
+}
+function requirementToField(name, req, themeId) {
+  const admin = buildAdminSlot(req, themeId);
   switch (req.type) {
     case "text":
     case "textarea":
@@ -480,7 +494,7 @@ function requirementToField(name, req) {
     case "checkbox":
     case "date":
     case "blocks":
-      return { type: req.type, name };
+      return admin ? { type: req.type, name, admin } : { type: req.type, name };
     case "upload": {
       if (!req.relationTo || Array.isArray(req.relationTo)) {
         log().warn(
@@ -489,11 +503,12 @@ function requirementToField(name, req) {
         );
         return null;
       }
-      return {
+      const base = {
         type: "upload",
         name,
         relationTo: req.relationTo
       };
+      return admin ? { ...base, admin } : base;
     }
     case "relationship": {
       if (!req.relationTo) {
@@ -508,14 +523,24 @@ function requirementToField(name, req) {
         name,
         relationTo: req.relationTo
       };
-      return req.hasMany ? { ...baseField, hasMany: true } : baseField;
+      const withMany = req.hasMany ? { ...baseField, hasMany: true } : baseField;
+      return admin ? { ...withMany, admin } : withMany;
+    }
+    case "select": {
+      if (!req.options || req.options.length === 0) {
+        log().warn(
+          "Skipping theme-required select field: requirement is missing an `options` list.",
+          { field: name }
+        );
+        return null;
+      }
+      const base = {
+        type: "select",
+        name,
+        options: [...req.options]
+      };
+      return admin ? { ...base, admin } : base;
     }
-    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;
@@ -527,6 +552,23 @@ function requirementToField(name, req) {
     }
   }
 }
+function mergeSelectOptions(base, contribution) {
+  if (contribution.length === 0) return base;
+  const byValue = new Map(base.map((o) => [o.value, o]));
+  let changed = false;
+  for (const opt of contribution) {
+    const existing = byValue.get(opt.value);
+    if (!existing) {
+      byValue.set(opt.value, opt);
+      changed = true;
+    } else if (existing.label !== opt.label) {
+      byValue.set(opt.value, opt);
+      changed = true;
+    }
+  }
+  if (!changed) return base;
+  return Array.from(byValue.values());
+}
 function collectExistingFieldNames(fields) {
   const names = /* @__PURE__ */ new Set();
   for (const f of fields) {
@@ -549,11 +591,11 @@ 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);
+      const synth2 = requirementToField(fieldName, fieldReq, themeId);
       if (synth2) fields.push(synth2);
       continue;
     }
-    const synth = requirementToField(fieldName, fieldReq);
+    const synth = requirementToField(fieldName, fieldReq, themeId);
     if (synth) {
       fields.push(synth);
       injectedNames.add(fieldName);
@@ -606,11 +648,36 @@ function mergeThemeRequirements(collections, themes) {
         continue;
       }
       const reqFields = req.fields;
-      if (!reqFields) continue;
+      const reqKinds = req.kinds;
+      if (!reqFields && !reqKinds) continue;
       const alreadyDeclared = existingFieldsBySlug.get(slug) ?? /* @__PURE__ */ new Set();
-      const toAdd = [];
-      for (const [fieldName, fieldReq] of Object.entries(reqFields)) {
+      const target = merged[existingIndex];
+      if (!target) continue;
+      let nextFields = target.fields;
+      let fieldsCloned = false;
+      const ensureCloned = () => {
+        if (!fieldsCloned) {
+          nextFields = [...nextFields];
+          fieldsCloned = true;
+        }
+        return nextFields;
+      };
+      for (const [fieldName, fieldReq] of Object.entries(reqFields ?? {})) {
         if (alreadyDeclared.has(fieldName)) {
+          if (fieldReq.type === "select" && fieldReq.options && fieldReq.options.length > 0) {
+            const idx = nextFields.findIndex(
+              (f) => "name" in f && f.name === fieldName
+            );
+            const existing = idx >= 0 ? nextFields[idx] : void 0;
+            if (existing && existing.type === "select") {
+              const merged2 = mergeSelectOptions(existing.options, fieldReq.options);
+              if (merged2 !== existing.options) {
+                const list = ensureCloned();
+                list[idx] = { ...existing, options: [...merged2] };
+              }
+              continue;
+            }
+          }
           const injectedHere2 = stats.injected.get(slug);
           if (injectedHere2?.has(fieldName)) {
             log().warn(
@@ -620,9 +687,9 @@ function mergeThemeRequirements(collections, themes) {
           }
           continue;
         }
-        const synth = requirementToField(fieldName, fieldReq);
+        const synth = requirementToField(fieldName, fieldReq, theme.manifest.id);
         if (!synth) continue;
-        toAdd.push(synth);
+        ensureCloned().push(synth);
         alreadyDeclared.add(fieldName);
         let injectedHere = stats.injected.get(slug);
         if (!injectedHere) {
@@ -631,12 +698,39 @@ function mergeThemeRequirements(collections, themes) {
         }
         injectedHere.add(fieldName);
       }
-      if (toAdd.length === 0) continue;
-      const target = merged[existingIndex];
-      if (!target) continue;
+      let nextAdmin = target.admin;
+      let adminCloned = false;
+      if (reqKinds && Object.keys(reqKinds).length > 0) {
+        const existingKinds = target.admin?.kinds ?? {};
+        const mergedKinds = { ...existingKinds };
+        for (const [kindValue, kindMeta] of Object.entries(reqKinds)) {
+          mergedKinds[kindValue] = {
+            ...mergedKinds[kindValue] ?? {},
+            ...kindMeta,
+            _themeOrigin: theme.manifest.id
+          };
+        }
+        nextAdmin = { ...target.admin ?? {}, kinds: mergedKinds };
+        adminCloned = true;
+      }
+      const reqGroupMeta = req.groupMeta;
+      if (reqGroupMeta && Object.keys(reqGroupMeta).length > 0) {
+        const existingMeta = nextAdmin?.groupMeta ?? target.admin?.groupMeta ?? {};
+        const mergedMeta = { ...existingMeta };
+        for (const [groupName, meta] of Object.entries(reqGroupMeta)) {
+          mergedMeta[groupName] = {
+            ...mergedMeta[groupName] ?? {},
+            ...meta
+          };
+        }
+        nextAdmin = { ...nextAdmin ?? target.admin ?? {}, groupMeta: mergedMeta };
+        adminCloned = true;
+      }
+      if (!fieldsCloned && !adminCloned) continue;
       merged[existingIndex] = {
         ...target,
-        fields: [...target.fields, ...toAdd]
+        ...fieldsCloned ? { fields: nextFields } : {},
+        ...adminCloned ? { admin: nextAdmin } : {}
       };
       existingFieldsBySlug.set(slug, alreadyDeclared);
     }
@@ -649,6 +743,17 @@ import { z } from "zod";
 var functionSchema = z.custom(
   (value) => typeof value === "function"
 );
+var conditionExprSchema = z.lazy(
+  () => z.union([
+    z.object({ when: z.string().min(1), equals: z.unknown() }),
+    z.object({ when: z.string().min(1), notEquals: z.unknown() }),
+    z.object({ when: z.string().min(1), in: z.array(z.unknown()) }),
+    z.object({ when: z.string().min(1), notIn: z.array(z.unknown()) }),
+    z.object({ when: z.string().min(1), exists: z.boolean() }),
+    z.object({ all: z.array(conditionExprSchema) }),
+    z.object({ any: z.array(conditionExprSchema) })
+  ])
+);
 var fieldBaseSchema = z.object({
   name: z.string().min(1),
   label: z.string().min(1).optional(),
@@ -659,7 +764,10 @@ var fieldBaseSchema = z.object({
     description: z.string().min(1).optional(),
     placeholder: z.string().optional(),
     readOnly: z.boolean().optional(),
-    condition: functionSchema.optional(),
+    // Accepts either the legacy function form (server-only, stripped
+    // at the RSC boundary) or the serializable expression form
+    // (#764). The runtime evaluator handles both.
+    condition: z.union([functionSchema, conditionExprSchema]).optional(),
     width: z.string().optional()
   }).optional(),
   validate: functionSchema.optional()
@@ -1038,7 +1146,7 @@ async function getActiveTheme() {
   const first = registry.values().next();
   return first.done ? null : first.value;
 }
-async function setActiveThemeId(id, updatedBy = null) {
+async function setActiveThemeId(id, updatedBy = null, options = {}) {
   if (!registry.has(id)) {
     throw new NpValidationError("Invalid input", [
       {
@@ -1047,10 +1155,10 @@ async function setActiveThemeId(id, updatedBy = null) {
       }
     ]);
   }
-  const db = getDb();
+  const dbHandle = options.tx ?? getDb();
   const now = /* @__PURE__ */ new Date();
   const siteId = await getCurrentSiteId() ?? NP_DEFAULT_SITE_ID;
-  await db.insert(npSettings).values({ siteId, key: "activeTheme", value: id, updatedAt: now, updatedBy }).onConflictDoUpdate({
+  await dbHandle.insert(npSettings).values({ siteId, key: "activeTheme", value: id, updatedAt: now, updatedBy }).onConflictDoUpdate({
     target: [npSettings.siteId, npSettings.key],
     set: { value: id, updatedAt: now, updatedBy }
   });
@@ -2032,6 +2140,7 @@ export {
   cleanupDeletedMedia,
   clearCustomRoutes,
   clearStringOverrideCacheForSite,
+  collectHiddenFieldNames,
   collectionConfigSchema,
   compareSemver,
   configureBuiltinJobContext,
@@ -2062,6 +2171,7 @@ export {
   dispatchPluginAction,
   enqueueJob,
   ensureDefaultSite,
+  evaluateFieldCondition,
   extractErrorComponent,
   extractMediaIds,
   extractMembersNotFoundComponent,
@@ -2166,6 +2276,7 @@ export {
   getThemeSettingsWithStatus,
   getThemeTemplateSummaries,
   getTranslationProgress,
+  getUserById,
   grantMemberRole,
   grantSiteMembership,
   hasRoleOnSite,
@@ -2393,6 +2504,7 @@ export {
   verifyToken,
   verifyTokenFull,
   withCurrentSite,
+  withDeferredPostCommit,
   withMemberWrite
 };
 //# sourceMappingURL=index.js.map