@nexpress/core 0.3.8 → 0.3.10

package/dist/index.js

@@ -4,7 +4,7 @@ import {
   introspectThemeSettingsSchema,
   pluginConfigCacheTag,
   setPluginConfig
-} from "./chunk-JKTU67A7.js";
+} from "./chunk-RCK73HJI.js";
 import {
   getPluginTemplatesForCollection,
   registerPluginTemplates,
@@ -41,7 +41,7 @@ import {
   renderSitemapIndexXml,
   renderSitemapXml,
   validateSeoSettingsPatch
-} from "./chunk-VX3HM5TF.js";
+} from "./chunk-IT4JBQK4.js";
 import {
   ARGON2_OPTIONS,
   authenticated,
@@ -82,7 +82,7 @@ import {
   verifyPassword,
   verifyToken,
   verifyTokenFull
-} from "./chunk-TIWJVQOO.js";
+} from "./chunk-LDY26JKB.js";
 import {
   DEFAULT_REACTION_KINDS,
   addReaction,
@@ -130,14 +130,14 @@ import {
   unfollow,
   unresolvedReportCount,
   updateComment
-} from "./chunk-6PFUXZJ6.js";
+} from "./chunk-2LNXTEBM.js";
 import {
   publishScheduledDocuments
-} from "./chunk-PPUHXOWZ.js";
+} from "./chunk-JMNDARCQ.js";
 import {
   buildDigestEmail,
   runDigestSweep
-} from "./chunk-K4CJ3KXB.js";
+} from "./chunk-X43DI2QJ.js";
 import {
   assertNotBanned,
   getCommunityRole,
@@ -146,14 +146,14 @@ import {
   registerCommunityRole,
   resetCommunityRoles,
   withMemberWrite
-} from "./chunk-XU2GJJ6Z.js";
+} from "./chunk-BGEPMNVB.js";
 import {
   getMutedTargetIds,
   isMuted,
   listMutes,
   muteMember,
   unmuteMember
-} from "./chunk-YEOQJ7WW.js";
+} from "./chunk-KS3S6TJS.js";
 import {
   getMemberNotificationPrefs,
   isNotificationKindEnabled,
@@ -175,7 +175,7 @@ import {
   markNotificationsRead,
   resolveMentionedMembers,
   unreadNotificationCount
-} from "./chunk-XPD7EQML.js";
+} from "./chunk-5NCTIJEN.js";
 import {
   applyReputation,
   getReputationAdapter,
@@ -194,7 +194,7 @@ import {
 } from "./chunk-KU5M27ZC.js";
 import {
   getMediaUrl
-} from "./chunk-EWVXP3GP.js";
+} from "./chunk-A3DPN2SP.js";
 import {
   autosaveRevision,
   buildSearchVector,
@@ -229,7 +229,7 @@ import {
   schedulePluginTask,
   updateMemberDocument,
   withDeferredPostCommit
-} from "./chunk-CD74WQK7.js";
+} from "./chunk-K4IYOAZJ.js";
 import {
   DEFAULT_IMAGE_SIZES,
   cleanupDeletedMedia,
@@ -241,7 +241,7 @@ import {
   processMediaImage,
   setStorageAdapter,
   uploadMedia
-} from "./chunk-EAYUAXW3.js";
+} from "./chunk-PXVCVEXV.js";
 import {
   can
 } from "./chunk-EQ2Z3KMD.js";
@@ -254,7 +254,7 @@ import {
   getCommunitySettings,
   updateCommunitySettings,
   validateCommunitySettingsPatch
-} from "./chunk-6MRTH734.js";
+} from "./chunk-KNSOZ2NN.js";
 import {
   createDbConnection,
   generateDocumentsModule,
@@ -303,7 +303,7 @@ import {
   setStrings,
   t,
   tSync
-} from "./chunk-2X3GBJOT.js";
+} from "./chunk-MLQKHRW2.js";
 import {
   getI18nConfig,
   resetI18nConfig,
@@ -326,7 +326,7 @@ import {
   registerCollection,
   resolveSiteForHostname,
   updateSite
-} from "./chunk-U4QCCLAW.js";
+} from "./chunk-MYUCR3SE.js";
 import {
   getCurrentSiteId,
   resetCurrentSiteResolver,
@@ -366,7 +366,7 @@ import {
   startWorker,
   stopProducer,
   stopWorker
-} from "./chunk-2O2KMHLO.js";
+} from "./chunk-UVLDAY4U.js";
 import {
   DEFAULT_JOB_LOG_RETENTION_MS,
   countJobLogs,
@@ -1058,7 +1058,7 @@ function defineCollection(config) {
 }
 
 // src/content/helpers.ts
-import { and as and2, desc, eq as eq2 } from "drizzle-orm";
+import { and as and2, desc, eq as eq2, getTableColumns, inArray } from "drizzle-orm";
 
 // src/theme/defaults.ts
 var DEFAULT_THEME = {
@@ -1327,7 +1327,88 @@ async function getPostBySlug(slug, options) {
   return result.docs[0] ?? null;
 }
 async function findPosts(options, user) {
-  return findDocuments("posts", options, user);
+  const resolved = await resolveHasManyRelationshipWhere("posts", options);
+  if (resolved.empty) {
+    return emptyFindResult(options);
+  }
+  return findDocuments("posts", { ...options, where: resolved.where }, user);
+}
+function emptyFindResult(options) {
+  const limit = options.limit ?? 20;
+  return {
+    docs: [],
+    totalDocs: 0,
+    totalPages: 0,
+    page: options.page ?? 1,
+    limit,
+    hasNextPage: false,
+    hasPrevPage: false
+  };
+}
+async function resolveHasManyRelationshipWhere(collectionSlug, options) {
+  const where = options.where ? { ...options.where } : {};
+  const registration = getCollectionRegistration(collectionSlug);
+  const joinTables = registration.joinTables ?? {};
+  const matchedIds = [];
+  for (const field of registration.config.fields) {
+    if (field.type !== "relationship" || !field.hasMany) continue;
+    const value = where[field.name];
+    if (value === void 0) continue;
+    const table = joinTables[field.name];
+    if (!table) {
+      throw new Error(
+        `Collection "${collectionSlug}" relationship field "${field.name}" has no registered join table.`
+      );
+    }
+    delete where[field.name];
+    const targetIds = (Array.isArray(value) ? value : [value]).filter(
+      (item) => typeof item === "string" && item.length > 0
+    );
+    if (targetIds.length === 0) {
+      matchedIds.push([]);
+      continue;
+    }
+    const pgTable = table;
+    const rows = await getDb().select({ id: parentColumn(pgTable) }).from(pgTable).where(inArray(column(pgTable, "targetId"), targetIds));
+    matchedIds.push(rows.map((row) => String(row.id)));
+  }
+  if (matchedIds.length === 0) {
+    return { where, empty: false };
+  }
+  let ids = matchedIds[0] ?? [];
+  for (let i = 1; i < matchedIds.length; i++) {
+    const allowed = new Set(matchedIds[i]);
+    ids = ids.filter((id) => allowed.has(id));
+  }
+  const existingId = where.id;
+  if (typeof existingId === "string") {
+    ids = ids.includes(existingId) ? [existingId] : [];
+  } else if (Array.isArray(existingId)) {
+    const allowed = new Set(existingId.filter((item) => typeof item === "string"));
+    ids = ids.filter((id) => allowed.has(id));
+  }
+  if (ids.length === 0) {
+    return { where, empty: true };
+  }
+  where.id = ids;
+  return { where, empty: false };
+}
+function column(table, key) {
+  const selected = getTableColumns(table)[key];
+  if (!selected) {
+    throw new Error(`Column '${key}' not found on relationship join table.`);
+  }
+  return selected;
+}
+function parentColumn(table) {
+  const columns = getTableColumns(table);
+  const key = Object.keys(columns).find(
+    (candidate) => candidate !== "id" && candidate !== "targetId" && candidate !== "order" && candidate.endsWith("Id")
+  );
+  if (!key) {
+    throw new Error("Parent column not found on relationship join table.");
+  }
+  return columns[key];
 }
 async function getAllPageSlugs() {
   const result = await findDocuments("pages", {