@dyrected/core 2.5.64 → 2.6.0

package/dist/server.cjs

@@ -177,7 +177,7 @@ var PopulationService = class {
     }
     const populatedDoc = { ...data };
     for (const field of fields) {
-      if (field.type === "join" && field.collection && field.on && currentDepth === 0) {
+      if (field.type === "join" && field.collection && field.on && currentDepth < maxDepth) {
         const targetCollection = this.collections.find(
           (c) => c.slug === field.collection
         );
@@ -196,7 +196,7 @@ var PopulationService = class {
                 (doc) => DefaultsService.apply(targetCollection.fields, doc)
               ),
               fields: targetCollection.fields,
-              currentDepth: 1,
+              currentDepth: currentDepth + 1,
               maxDepth
             });
             populatedDoc[field.name] = {
@@ -1387,6 +1387,191 @@ function humanizeProviderName(id, type) {
   return cleaned.replace(/\b\w/g, (char) => char.toUpperCase());
 }
 
+// src/utils/collection-search.ts
+var DEFAULT_SEARCHABLE_NAMES = /* @__PURE__ */ new Set([
+  "title",
+  "name",
+  "label",
+  "slug",
+  "email",
+  "caption",
+  "description"
+]);
+var MAX_RELATION_MATCHES = 50;
+var MAX_RELATION_TITLE_DEPTH = 8;
+var TITLE_FALLBACK_NAMES = ["title", "name", "label", "heading", "email", "subject"];
+function isScalarSearchField(field) {
+  return field.type === "text" || field.type === "textarea" || field.type === "richText" || field.type === "email";
+}
+function findFieldByName(collection, fieldName) {
+  if (!fieldName) return void 0;
+  return collection.fields.find((field) => field.name === fieldName);
+}
+function resolveCollectionTitleField(collection) {
+  const configured = findFieldByName(collection, collection.admin?.useAsTitle);
+  if (configured) return configured;
+  for (const name of TITLE_FALLBACK_NAMES) {
+    const field = findFieldByName(collection, name);
+    if (field) return field;
+  }
+  return collection.fields.find((field) => !!field.name && field.type !== "join" && field.type !== "row");
+}
+function getCollectionSearchableFields(collection) {
+  const fieldByName = new Map(
+    collection.fields.filter((field) => !!field.name).map((field) => [field.name, field])
+  );
+  const configured = collection.admin?.searchableFields?.map((fieldName) => fieldByName.get(fieldName)).filter((field) => !!field);
+  if (configured && configured.length > 0) {
+    return configured;
+  }
+  const results = [];
+  const pushUnique = (field) => {
+    if (!field?.name) return;
+    if (results.some((item) => item.name === field.name)) return;
+    results.push(field);
+  };
+  pushUnique(findFieldByName(collection, collection.admin?.useAsTitle));
+  for (const field of collection.fields) {
+    if (!field.name) continue;
+    if (isScalarSearchField(field) && DEFAULT_SEARCHABLE_NAMES.has(field.name)) {
+      pushUnique(field);
+    }
+  }
+  return results;
+}
+function buildScalarSearchClause(fieldName, search) {
+  return { [fieldName]: { contains: search } };
+}
+function getFallbackTitleFields(collection) {
+  const fields = [];
+  for (const name of TITLE_FALLBACK_NAMES) {
+    const field = findFieldByName(collection, name);
+    if (!field?.name || !isScalarSearchField(field)) continue;
+    if (fields.some((item) => item.name === field.name)) continue;
+    fields.push(field);
+  }
+  return fields;
+}
+async function findMatchingDocumentIdsByWhere(args) {
+  const { collection, where, db } = args;
+  if (!where) return [];
+  const matches = await db.find({
+    collection: collection.slug,
+    where,
+    limit: MAX_RELATION_MATCHES
+  });
+  return matches.docs.map((doc) => doc?.id).filter((id) => typeof id === "string");
+}
+function buildMultiRelationshipClause(fieldName, ids) {
+  const matches = ids.map((id) => ({
+    OR: [
+      { [fieldName]: { contains: `"${id}"` } },
+      { [fieldName]: { contains: id } }
+    ]
+  }));
+  if (matches.length === 0) return void 0;
+  return matches.length === 1 ? matches[0] : { OR: matches };
+}
+function buildRelationshipMatchClause(field, ids) {
+  if (!field.name || ids.length === 0) return void 0;
+  if (field.hasMany) {
+    return buildMultiRelationshipClause(field.name, ids);
+  }
+  return { [field.name]: { in: ids } };
+}
+async function findMatchingDocumentIdsByTitle(args) {
+  const { collection, search, db, collections, depth = 0 } = args;
+  if (depth >= MAX_RELATION_TITLE_DEPTH) {
+    return [];
+  }
+  const ids = /* @__PURE__ */ new Set();
+  const titleField = resolveCollectionTitleField(collection);
+  if (titleField?.name && isScalarSearchField(titleField)) {
+    for (const id of await findMatchingDocumentIdsByWhere({
+      collection,
+      where: buildScalarSearchClause(titleField.name, search),
+      db
+    })) {
+      ids.add(id);
+    }
+  }
+  if (titleField?.type === "relationship" && titleField.relationTo) {
+    for (const field of getFallbackTitleFields(collection)) {
+      for (const id of await findMatchingDocumentIdsByWhere({
+        collection,
+        where: buildScalarSearchClause(field.name, search),
+        db
+      })) {
+        ids.add(id);
+      }
+    }
+    const relatedCollection = collections.find(
+      (item) => item.slug === titleField.relationTo
+    );
+    if (relatedCollection) {
+      const relatedIds = await findMatchingDocumentIdsByTitle({
+        collection: relatedCollection,
+        search,
+        db,
+        collections,
+        depth: depth + 1
+      });
+      const relationClause = buildRelationshipMatchClause(titleField, relatedIds);
+      for (const id of await findMatchingDocumentIdsByWhere({
+        collection,
+        where: relationClause,
+        db
+      })) {
+        ids.add(id);
+      }
+    }
+  }
+  return Array.from(ids).slice(0, MAX_RELATION_MATCHES);
+}
+async function buildRelationshipSearchClause(args) {
+  const { field, search, db, collections } = args;
+  if (!field.name || field.type !== "relationship" || !field.relationTo) {
+    return void 0;
+  }
+  const relatedCollection = collections.find(
+    (collection) => collection.slug === field.relationTo
+  );
+  if (!relatedCollection) return void 0;
+  const ids = await findMatchingDocumentIdsByTitle({
+    collection: relatedCollection,
+    search,
+    db,
+    collections
+  });
+  return buildRelationshipMatchClause(field, ids);
+}
+async function buildCollectionSearchWhere(args) {
+  const { collection, search, db, collections } = args;
+  const trimmedSearch = search?.trim();
+  if (!trimmedSearch) return void 0;
+  const searchableFields = getCollectionSearchableFields(collection);
+  if (searchableFields.length === 0) return void 0;
+  const clauses = [];
+  for (const field of searchableFields) {
+    if (!field.name) continue;
+    if (isScalarSearchField(field)) {
+      clauses.push(buildScalarSearchClause(field.name, trimmedSearch));
+      continue;
+    }
+    if (field.type === "relationship") {
+      const clause = await buildRelationshipSearchClause({
+        field,
+        search: trimmedSearch,
+        db,
+        collections
+      });
+      if (clause) clauses.push(clause);
+    }
+  }
+  if (clauses.length === 0) return void 0;
+  return clauses.length === 1 ? clauses[0] : { OR: clauses };
+}
+
 // src/utils/access-control.ts
 function toHookRequestContext(req) {
   return {
@@ -1899,6 +2084,7 @@ var CollectionController = class {
       const limit2 = Number(c.req.query("limit")) || 10;
       const page2 = Number(c.req.query("page")) || 1;
       const sort2 = c.req.query("sort") || void 0;
+      const search2 = c.req.query("search") || void 0;
       let where2 = void 0;
       const whereRaw2 = c.req.query("where");
       if (whereRaw2) {
@@ -1907,6 +2093,15 @@ var CollectionController = class {
         } catch {
         }
       }
+      const searchWhere2 = await buildCollectionSearchWhere({
+        collection: this.collection,
+        search: search2,
+        db: createReadonlyDb(db),
+        collections: config.collections
+      });
+      if (searchWhere2) {
+        where2 = mergeWhereConstraint(where2, searchWhere2);
+      }
       const paginatedResult = await provider.members.list({
         limit: limit2,
         page: page2,
@@ -1941,6 +2136,7 @@ var CollectionController = class {
     const page = Number(c.req.query("page")) || 1;
     const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 1;
     const sort = c.req.query("sort") || void 0;
+    const search = c.req.query("search") || void 0;
     const user = c.get("user");
     let where = void 0;
     const whereRaw = c.req.query("where");
@@ -1961,6 +2157,15 @@ var CollectionController = class {
         }
       }
     }
+    const searchWhere = await buildCollectionSearchWhere({
+      collection: this.collection,
+      search,
+      db: readonlyDb,
+      collections: config.collections
+    });
+    if (searchWhere) {
+      where = mergeWhereConstraint(where, searchWhere);
+    }
     const beforeReadResult = await runCollectionHooks(
       this.collection.hooks?.beforeRead,
       {
@@ -5312,6 +5517,12 @@ function generateOpenApi(config) {
             schema: { type: "string" },
             description: "JSON filter"
           },
+          {
+            name: "search",
+            in: "query",
+            schema: { type: "string" },
+            description: "Free-text search across configured searchable fields"
+          },
           {
             name: "sort",
             in: "query",
@@ -5508,13 +5719,6 @@ function generateOpenApi(config) {
         }
       };
     }
-    spec.paths[`${path}/seed`] = {
-      post: {
-        tags: [collectionTag],
-        summary: `Seed initial ${labels.plural}`,
-        responses: { 200: { description: "Seeded documents" } }
-      }
-    };
     if (collection.upload) {
       spec.paths[`${path}/media`] = {
         get: {
@@ -5816,13 +6020,6 @@ function generateOpenApi(config) {
         }
       }
     };
-    spec.paths[`${path}/seed`] = {
-      post: {
-        tags: [globalTag],
-        summary: `Seed ${global.label || slug}`,
-        responses: { 200: { description: "Seeded global" } }
-      }
-    };
   }
   if (config.storage) {
     spec.paths["/api/media/{filename}"] = {
@@ -6582,7 +6779,6 @@ function registerRoutes(app, config) {
     app.get(`${path}/:id`, (c) => controller.findOne(c));
     app.patch(`${path}/:id`, (c) => controller.update(c));
     app.delete(`${path}/:id`, (c) => controller.delete(c));
-    app.post(`${path}/seed`, (c) => controller.seed(c));
     if (collection.auth) {
       app.post(
         `${path}/:id/change-password`,
@@ -6608,7 +6804,6 @@ function registerRoutes(app, config) {
     const controller = new GlobalController(global);
     app.get(path, (c) => controller.get(c));
     app.patch(path, (c) => controller.update(c));
-    app.post(`${path}/seed`, (c) => controller.seed(c));
   }
   if (!process.env.DYRECTED_JWT_SECRET) {
     getConfigLogger(config, "router").warn({
@@ -6757,7 +6952,6 @@ function registerRoutes(app, config) {
             return controller.deleteMany(c);
           if (method === "DELETE") return controller.delete(c);
           if (method === "POST" && id === "media") return controller.create(c);
-          if (method === "POST" && id === "seed") return controller.seed(c);
         } else {
           if (method === "GET") return controller.find(c);
           if (method === "POST") return controller.create(c);
@@ -6783,9 +6977,7 @@ function registerRoutes(app, config) {
       if (global) {
         const controller = new GlobalController(global);
         const method = c.req.method;
-        if (id) {
-          if (method === "POST" && id === "seed") return controller.seed(c);
-        } else {
+        if (!id) {
           if (method === "GET") return controller.get(c);
           if (method === "PATCH") return controller.update(c);
         }

package/dist/server.d.cts

@@ -2,7 +2,7 @@ import * as hono_types from 'hono/types';
 import * as hono from 'hono';
 import { Hono, Context } from 'hono';
 import { Logger } from 'pino';
-import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-Dv5XACR4.cjs';
+import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-DbK2Tv6i.cjs';
 import { JWTPayload } from 'jose';
 import { Tracer, Counter, Attributes, Histogram, Span } from '@opentelemetry/api';
 import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';

package/dist/server.d.ts

@@ -2,7 +2,7 @@ import * as hono_types from 'hono/types';
 import * as hono from 'hono';
 import { Hono, Context } from 'hono';
 import { Logger } from 'pino';
-import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-Dv5XACR4.js';
+import { D as DyrectedConfig, C as CollectionConfig, G as GlobalConfig } from './app-config-DbK2Tv6i.js';
 import { JWTPayload } from 'jose';
 import { Tracer, Counter, Attributes, Histogram, Span } from '@opentelemetry/api';
 import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';

package/dist/server.js

@@ -36,7 +36,7 @@ import {
   touchAuthSession,
   transitionWorkflow,
   verifyCollectionToken
-} from "./chunk-TEGRS6J7.js";
+} from "./chunk-K3ASMUKV.js";
 
 // src/app.ts
 import { Hono } from "hono";
@@ -110,7 +110,7 @@ var PopulationService = class {
     }
     const populatedDoc = { ...data };
     for (const field of fields) {
-      if (field.type === "join" && field.collection && field.on && currentDepth === 0) {
+      if (field.type === "join" && field.collection && field.on && currentDepth < maxDepth) {
         const targetCollection = this.collections.find(
           (c) => c.slug === field.collection
         );
@@ -129,7 +129,7 @@ var PopulationService = class {
                 (doc) => DefaultsService.apply(targetCollection.fields, doc)
               ),
               fields: targetCollection.fields,
-              currentDepth: 1,
+              currentDepth: currentDepth + 1,
               maxDepth
             });
             populatedDoc[field.name] = {
@@ -487,6 +487,191 @@ async function resolveAccess(config, access, args) {
   return false;
 }
 
+// src/utils/collection-search.ts
+var DEFAULT_SEARCHABLE_NAMES = /* @__PURE__ */ new Set([
+  "title",
+  "name",
+  "label",
+  "slug",
+  "email",
+  "caption",
+  "description"
+]);
+var MAX_RELATION_MATCHES = 50;
+var MAX_RELATION_TITLE_DEPTH = 8;
+var TITLE_FALLBACK_NAMES = ["title", "name", "label", "heading", "email", "subject"];
+function isScalarSearchField(field) {
+  return field.type === "text" || field.type === "textarea" || field.type === "richText" || field.type === "email";
+}
+function findFieldByName(collection, fieldName) {
+  if (!fieldName) return void 0;
+  return collection.fields.find((field) => field.name === fieldName);
+}
+function resolveCollectionTitleField(collection) {
+  const configured = findFieldByName(collection, collection.admin?.useAsTitle);
+  if (configured) return configured;
+  for (const name of TITLE_FALLBACK_NAMES) {
+    const field = findFieldByName(collection, name);
+    if (field) return field;
+  }
+  return collection.fields.find((field) => !!field.name && field.type !== "join" && field.type !== "row");
+}
+function getCollectionSearchableFields(collection) {
+  const fieldByName = new Map(
+    collection.fields.filter((field) => !!field.name).map((field) => [field.name, field])
+  );
+  const configured = collection.admin?.searchableFields?.map((fieldName) => fieldByName.get(fieldName)).filter((field) => !!field);
+  if (configured && configured.length > 0) {
+    return configured;
+  }
+  const results = [];
+  const pushUnique = (field) => {
+    if (!field?.name) return;
+    if (results.some((item) => item.name === field.name)) return;
+    results.push(field);
+  };
+  pushUnique(findFieldByName(collection, collection.admin?.useAsTitle));
+  for (const field of collection.fields) {
+    if (!field.name) continue;
+    if (isScalarSearchField(field) && DEFAULT_SEARCHABLE_NAMES.has(field.name)) {
+      pushUnique(field);
+    }
+  }
+  return results;
+}
+function buildScalarSearchClause(fieldName, search) {
+  return { [fieldName]: { contains: search } };
+}
+function getFallbackTitleFields(collection) {
+  const fields = [];
+  for (const name of TITLE_FALLBACK_NAMES) {
+    const field = findFieldByName(collection, name);
+    if (!field?.name || !isScalarSearchField(field)) continue;
+    if (fields.some((item) => item.name === field.name)) continue;
+    fields.push(field);
+  }
+  return fields;
+}
+async function findMatchingDocumentIdsByWhere(args) {
+  const { collection, where, db } = args;
+  if (!where) return [];
+  const matches = await db.find({
+    collection: collection.slug,
+    where,
+    limit: MAX_RELATION_MATCHES
+  });
+  return matches.docs.map((doc) => doc?.id).filter((id) => typeof id === "string");
+}
+function buildMultiRelationshipClause(fieldName, ids) {
+  const matches = ids.map((id) => ({
+    OR: [
+      { [fieldName]: { contains: `"${id}"` } },
+      { [fieldName]: { contains: id } }
+    ]
+  }));
+  if (matches.length === 0) return void 0;
+  return matches.length === 1 ? matches[0] : { OR: matches };
+}
+function buildRelationshipMatchClause(field, ids) {
+  if (!field.name || ids.length === 0) return void 0;
+  if (field.hasMany) {
+    return buildMultiRelationshipClause(field.name, ids);
+  }
+  return { [field.name]: { in: ids } };
+}
+async function findMatchingDocumentIdsByTitle(args) {
+  const { collection, search, db, collections, depth = 0 } = args;
+  if (depth >= MAX_RELATION_TITLE_DEPTH) {
+    return [];
+  }
+  const ids = /* @__PURE__ */ new Set();
+  const titleField = resolveCollectionTitleField(collection);
+  if (titleField?.name && isScalarSearchField(titleField)) {
+    for (const id of await findMatchingDocumentIdsByWhere({
+      collection,
+      where: buildScalarSearchClause(titleField.name, search),
+      db
+    })) {
+      ids.add(id);
+    }
+  }
+  if (titleField?.type === "relationship" && titleField.relationTo) {
+    for (const field of getFallbackTitleFields(collection)) {
+      for (const id of await findMatchingDocumentIdsByWhere({
+        collection,
+        where: buildScalarSearchClause(field.name, search),
+        db
+      })) {
+        ids.add(id);
+      }
+    }
+    const relatedCollection = collections.find(
+      (item) => item.slug === titleField.relationTo
+    );
+    if (relatedCollection) {
+      const relatedIds = await findMatchingDocumentIdsByTitle({
+        collection: relatedCollection,
+        search,
+        db,
+        collections,
+        depth: depth + 1
+      });
+      const relationClause = buildRelationshipMatchClause(titleField, relatedIds);
+      for (const id of await findMatchingDocumentIdsByWhere({
+        collection,
+        where: relationClause,
+        db
+      })) {
+        ids.add(id);
+      }
+    }
+  }
+  return Array.from(ids).slice(0, MAX_RELATION_MATCHES);
+}
+async function buildRelationshipSearchClause(args) {
+  const { field, search, db, collections } = args;
+  if (!field.name || field.type !== "relationship" || !field.relationTo) {
+    return void 0;
+  }
+  const relatedCollection = collections.find(
+    (collection) => collection.slug === field.relationTo
+  );
+  if (!relatedCollection) return void 0;
+  const ids = await findMatchingDocumentIdsByTitle({
+    collection: relatedCollection,
+    search,
+    db,
+    collections
+  });
+  return buildRelationshipMatchClause(field, ids);
+}
+async function buildCollectionSearchWhere(args) {
+  const { collection, search, db, collections } = args;
+  const trimmedSearch = search?.trim();
+  if (!trimmedSearch) return void 0;
+  const searchableFields = getCollectionSearchableFields(collection);
+  if (searchableFields.length === 0) return void 0;
+  const clauses = [];
+  for (const field of searchableFields) {
+    if (!field.name) continue;
+    if (isScalarSearchField(field)) {
+      clauses.push(buildScalarSearchClause(field.name, trimmedSearch));
+      continue;
+    }
+    if (field.type === "relationship") {
+      const clause = await buildRelationshipSearchClause({
+        field,
+        search: trimmedSearch,
+        db,
+        collections
+      });
+      if (clause) clauses.push(clause);
+    }
+  }
+  if (clauses.length === 0) return void 0;
+  return clauses.length === 1 ? clauses[0] : { OR: clauses };
+}
+
 // src/utils/access-control.ts
 function toHookRequestContext(req) {
   return {
@@ -711,6 +896,7 @@ var CollectionController = class {
       const limit2 = Number(c.req.query("limit")) || 10;
       const page2 = Number(c.req.query("page")) || 1;
       const sort2 = c.req.query("sort") || void 0;
+      const search2 = c.req.query("search") || void 0;
       let where2 = void 0;
       const whereRaw2 = c.req.query("where");
       if (whereRaw2) {
@@ -719,6 +905,15 @@ var CollectionController = class {
         } catch {
         }
       }
+      const searchWhere2 = await buildCollectionSearchWhere({
+        collection: this.collection,
+        search: search2,
+        db: createReadonlyDb(db),
+        collections: config.collections
+      });
+      if (searchWhere2) {
+        where2 = mergeWhereConstraint(where2, searchWhere2);
+      }
       const paginatedResult = await provider.members.list({
         limit: limit2,
         page: page2,
@@ -753,6 +948,7 @@ var CollectionController = class {
     const page = Number(c.req.query("page")) || 1;
     const depth = c.req.query("depth") !== void 0 ? Number(c.req.query("depth")) : 1;
     const sort = c.req.query("sort") || void 0;
+    const search = c.req.query("search") || void 0;
     const user = c.get("user");
     let where = void 0;
     const whereRaw = c.req.query("where");
@@ -773,6 +969,15 @@ var CollectionController = class {
         }
       }
     }
+    const searchWhere = await buildCollectionSearchWhere({
+      collection: this.collection,
+      search,
+      db: readonlyDb,
+      collections: config.collections
+    });
+    if (searchWhere) {
+      where = mergeWhereConstraint(where, searchWhere);
+    }
     const beforeReadResult = await runCollectionHooks(
       this.collection.hooks?.beforeRead,
       {
@@ -4321,7 +4526,6 @@ function registerRoutes(app, config) {
     app.get(`${path}/:id`, (c) => controller.findOne(c));
     app.patch(`${path}/:id`, (c) => controller.update(c));
     app.delete(`${path}/:id`, (c) => controller.delete(c));
-    app.post(`${path}/seed`, (c) => controller.seed(c));
     if (collection.auth) {
       app.post(
         `${path}/:id/change-password`,
@@ -4347,7 +4551,6 @@ function registerRoutes(app, config) {
     const controller = new GlobalController(global);
     app.get(path, (c) => controller.get(c));
     app.patch(path, (c) => controller.update(c));
-    app.post(`${path}/seed`, (c) => controller.seed(c));
   }
   if (!process.env.DYRECTED_JWT_SECRET) {
     getConfigLogger(config, "router").warn({
@@ -4496,7 +4699,6 @@ function registerRoutes(app, config) {
             return controller.deleteMany(c);
           if (method === "DELETE") return controller.delete(c);
           if (method === "POST" && id === "media") return controller.create(c);
-          if (method === "POST" && id === "seed") return controller.seed(c);
         } else {
           if (method === "GET") return controller.find(c);
           if (method === "POST") return controller.create(c);
@@ -4522,9 +4724,7 @@ function registerRoutes(app, config) {
       if (global) {
         const controller = new GlobalController(global);
         const method = c.req.method;
-        if (id) {
-          if (method === "POST" && id === "seed") return controller.seed(c);
-        } else {
+        if (!id) {
           if (method === "GET") return controller.get(c);
           if (method === "PATCH") return controller.update(c);
         }

package/package.json

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