@open-mercato/core 0.6.7 → 0.6.8-develop.6874.1.982d6097d8

package/src/modules/query_index/i18n/de.json

@@ -18,7 +18,6 @@
   "query_index.table.columns.entity": "Entität",
   "query_index.table.columns.fulltext": "Volltext",
   "query_index.table.columns.indexed": "Indexiert",
-  "query_index.table.columns.label": "Beschriftung",
   "query_index.table.columns.records": "Datensätze",
   "query_index.table.columns.status": "Status",
   "query_index.table.columns.vector": "Vektor",
@@ -35,6 +34,10 @@
   "query_index.table.errors.subtitle": "Die letzten 100 Fehler für Query- und Vektor-Indexer in diesem Bereich.",
   "query_index.table.errors.title": "Aktuelle Indexer-Fehler",
   "query_index.table.errors.viewDetails": "Technische Details anzeigen",
+  "query_index.table.filters.backend": "Backend",
+  "query_index.table.filters.backendOptions.customFields": "Benutzerdefinierte Felder",
+  "query_index.table.filters.backendOptions.fulltext": "Volltextsuche",
+  "query_index.table.filters.backendOptions.vector": "Vektorsuche",
   "query_index.table.logs.columns.message": "Nachricht",
   "query_index.table.logs.columns.source": "Quelle",
   "query_index.table.logs.columns.timestamp": "Zeitstempel",
@@ -48,6 +51,7 @@
   "query_index.table.searchPlaceholder": "Nach Entität filtern",
   "query_index.table.status.failed": "Fehlgeschlagen",
   "query_index.table.status.in_sync": "Synchron",
+  "query_index.table.status.not_measured": "Noch nicht gemessen",
   "query_index.table.status.out_of_sync": "Nicht synchron",
   "query_index.table.status.partitionLabel": "Partition {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -61,7 +65,5 @@
   "query_index.table.status.scope.stalled": "Angehalten",
   "query_index.table.status.scopeLabel": "Bereich",
   "query_index.table.status.stalled": "Angehalten",
-  "query_index.table.status.vectorLabel": "Vektor",
-  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

package/src/modules/query_index/i18n/en.json

@@ -18,7 +18,6 @@
   "query_index.table.columns.entity": "Entity",
   "query_index.table.columns.fulltext": "Full-text",
   "query_index.table.columns.indexed": "Indexed",
-  "query_index.table.columns.label": "Label",
   "query_index.table.columns.records": "Records",
   "query_index.table.columns.status": "Status",
   "query_index.table.columns.vector": "Vector",
@@ -35,6 +34,10 @@
   "query_index.table.errors.subtitle": "Last 100 errors recorded for query index and vector index jobs in this scope.",
   "query_index.table.errors.title": "Recent indexer errors",
   "query_index.table.errors.viewDetails": "View technical details",
+  "query_index.table.filters.backend": "Backend",
+  "query_index.table.filters.backendOptions.customFields": "Custom fields",
+  "query_index.table.filters.backendOptions.fulltext": "Full-text search",
+  "query_index.table.filters.backendOptions.vector": "Vector search",
   "query_index.table.logs.columns.message": "Message",
   "query_index.table.logs.columns.source": "Source",
   "query_index.table.logs.columns.timestamp": "Timestamp",
@@ -48,6 +51,7 @@
   "query_index.table.searchPlaceholder": "Filter by entity",
   "query_index.table.status.failed": "Failed",
   "query_index.table.status.in_sync": "In sync",
+  "query_index.table.status.not_measured": "Not measured yet",
   "query_index.table.status.out_of_sync": "Out of sync",
   "query_index.table.status.partitionLabel": "Partition {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -61,7 +65,5 @@
   "query_index.table.status.scope.stalled": "Stalled",
   "query_index.table.status.scopeLabel": "Scope",
   "query_index.table.status.stalled": "Stalled",
-  "query_index.table.status.vectorLabel": "Vector",
-  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

package/src/modules/query_index/i18n/es.json

@@ -18,7 +18,6 @@
   "query_index.table.columns.entity": "Entidad",
   "query_index.table.columns.fulltext": "Texto completo",
   "query_index.table.columns.indexed": "Indexados",
-  "query_index.table.columns.label": "Etiqueta",
   "query_index.table.columns.records": "Registros",
   "query_index.table.columns.status": "Estado",
   "query_index.table.columns.vector": "Vectorial",
@@ -35,6 +34,10 @@
   "query_index.table.errors.subtitle": "Últimos 100 errores registrados para los trabajos del índice de consultas y vector en este ámbito.",
   "query_index.table.errors.title": "Errores recientes del indexador",
   "query_index.table.errors.viewDetails": "Ver detalles técnicos",
+  "query_index.table.filters.backend": "Backend",
+  "query_index.table.filters.backendOptions.customFields": "Campos personalizados",
+  "query_index.table.filters.backendOptions.fulltext": "Búsqueda de texto completo",
+  "query_index.table.filters.backendOptions.vector": "Búsqueda vectorial",
   "query_index.table.logs.columns.message": "Mensaje",
   "query_index.table.logs.columns.source": "Origen",
   "query_index.table.logs.columns.timestamp": "Marca de tiempo",
@@ -48,6 +51,7 @@
   "query_index.table.searchPlaceholder": "Filtrar por entidad",
   "query_index.table.status.failed": "Con errores",
   "query_index.table.status.in_sync": "Sincronizado",
+  "query_index.table.status.not_measured": "Aún no medido",
   "query_index.table.status.out_of_sync": "Fuera de sincronización",
   "query_index.table.status.partitionLabel": "Partición {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -61,7 +65,5 @@
   "query_index.table.status.scope.stalled": "Detenido",
   "query_index.table.status.scopeLabel": "Ámbito",
   "query_index.table.status.stalled": "Detenido",
-  "query_index.table.status.vectorLabel": "Vectorial",
-  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

package/src/modules/query_index/i18n/ko.json

@@ -0,0 +1,69 @@
+{
+  "query_index.banner.dismiss": "닫기",
+  "query_index.banner.manage_indexes": "인덱스 관리",
+  "query_index.banner.partial_counts": "{{total}}개 레코드 중 {{indexed}}개가 인덱싱되었습니다.",
+  "query_index.banner.partial_counts_excess": "현재 인덱스에 {{total}}개 레코드에 대해 {{indexed}}개 항목이 있습니다. 오래된 행을 정리하려면 재인덱싱하세요.",
+  "query_index.banner.partial_description": "쿼리 인덱스에서 부분적인 커버리지가 감지되었습니다. 모든 레코드를 새로 고치려면 재인덱싱하세요.",
+  "query_index.banner.partial_entity": "엔터티: {{entity}}",
+  "query_index.banner.partial_global_note": "다른 조직의 일부 레코드가 아직 인덱스에서 누락되어 있습니다.",
+  "query_index.banner.partial_title": "결과가 불완전할 수 있습니다",
+  "query_index.nav.queryIndexes": "쿼리 인덱스",
+  "query_index.table.actions.fulltextPurge": "전체 텍스트 검색 삭제",
+  "query_index.table.actions.fulltextReindex": "전체 텍스트 검색 재인덱싱",
+  "query_index.table.actions.purge": "삭제",
+  "query_index.table.actions.reindex": "재인덱싱",
+  "query_index.table.actions.reindexForce": "전체 재인덱싱 강제 실행",
+  "query_index.table.actions.vectorPurge": "벡터 검색 삭제",
+  "query_index.table.actions.vectorReindex": "벡터 검색 재인덱싱",
+  "query_index.table.columns.entity": "엔터티",
+  "query_index.table.columns.fulltext": "전체 텍스트",
+  "query_index.table.columns.indexed": "인덱싱됨",
+  "query_index.table.columns.records": "레코드",
+  "query_index.table.columns.status": "상태",
+  "query_index.table.columns.vector": "벡터",
+  "query_index.table.confirm.fulltextPurge": "이 엔터티의 전체 텍스트 인덱스를 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
+  "query_index.table.confirm.vectorPurge": "이 엔터티의 벡터 임베딩을 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
+  "query_index.table.errors.actionFailed": "{{action}} 실행에 실패했습니다.",
+  "query_index.table.errors.columns.details": "상세 정보",
+  "query_index.table.errors.columns.source": "소스",
+  "query_index.table.errors.columns.timestamp": "타임스탬프",
+  "query_index.table.errors.empty": "최근 오류가 기록되지 않았습니다.",
+  "query_index.table.errors.loadFailed": "쿼리 인덱스 상태를 불러오지 못했습니다.",
+  "query_index.table.errors.scope.organization": "조직 {{organizationId}}",
+  "query_index.table.errors.scope.tenant": "테넌트 {{tenantId}}",
+  "query_index.table.errors.subtitle": "이 범위의 쿼리 인덱스 및 벡터 인덱스 작업에 대해 기록된 최근 100개 오류입니다.",
+  "query_index.table.errors.title": "최근 인덱서 오류",
+  "query_index.table.errors.viewDetails": "기술 상세 정보 보기",
+  "query_index.table.filters.backend": "백엔드",
+  "query_index.table.filters.backendOptions.customFields": "사용자 정의 필드",
+  "query_index.table.filters.backendOptions.fulltext": "전체 텍스트 검색",
+  "query_index.table.filters.backendOptions.vector": "벡터 검색",
+  "query_index.table.logs.columns.message": "메시지",
+  "query_index.table.logs.columns.source": "소스",
+  "query_index.table.logs.columns.timestamp": "타임스탬프",
+  "query_index.table.logs.empty": "최근 활동이 없습니다.",
+  "query_index.table.logs.level.info": "정보",
+  "query_index.table.logs.level.warn": "경고",
+  "query_index.table.logs.subtitle": "이 범위의 쿼리 인덱스 및 벡터 인덱스 작업에 대해 기록된 최근 100개 상태 로그입니다.",
+  "query_index.table.logs.title": "최근 인덱서 활동",
+  "query_index.table.logs.viewDetails": "상세 정보 보기",
+  "query_index.table.refresh": "새로고침",
+  "query_index.table.searchPlaceholder": "엔터티로 필터링",
+  "query_index.table.status.failed": "실패한",
+  "query_index.table.status.in_sync": "동기화됨",
+  "query_index.table.status.not_measured": "아직 측정되지 않음",
+  "query_index.table.status.out_of_sync": "동기화 안 됨",
+  "query_index.table.status.partitionLabel": "파티션 {{index}}",
+  "query_index.table.status.progress": "{{processed}}/{{total}}",
+  "query_index.table.status.progressSingle": "{{processed}}",
+  "query_index.table.status.purging": "삭제 중",
+  "query_index.table.status.reindexing": "재인덱싱 중",
+  "query_index.table.status.scope.completed": "완료",
+  "query_index.table.status.scope.failed": "실패한",
+  "query_index.table.status.scope.purging": "삭제 중",
+  "query_index.table.status.scope.reindexing": "실행 중",
+  "query_index.table.status.scope.stalled": "정체됨",
+  "query_index.table.status.scopeLabel": "범위",
+  "query_index.table.status.stalled": "정체됨",
+  "query_index.table.status.withProgress": "{{status}} ({{progress}})"
+}

package/src/modules/query_index/i18n/pl.json

@@ -18,7 +18,6 @@
   "query_index.table.columns.entity": "Encja",
   "query_index.table.columns.fulltext": "Pełnotekstowy",
   "query_index.table.columns.indexed": "Zindeksowane",
-  "query_index.table.columns.label": "Etykieta",
   "query_index.table.columns.records": "Rekordy",
   "query_index.table.columns.status": "Status",
   "query_index.table.columns.vector": "Wektor",
@@ -35,6 +34,10 @@
   "query_index.table.errors.subtitle": "Ostatnie 100 błędów zapisanych dla zadań indeksu zapytań i wektorowego w tym zakresie.",
   "query_index.table.errors.title": "Ostatnie błędy indeksowania",
   "query_index.table.errors.viewDetails": "Pokaż szczegóły techniczne",
+  "query_index.table.filters.backend": "Backend",
+  "query_index.table.filters.backendOptions.customFields": "Pola niestandardowe",
+  "query_index.table.filters.backendOptions.fulltext": "Wyszukiwanie pełnotekstowe",
+  "query_index.table.filters.backendOptions.vector": "Wyszukiwanie wektorowe",
   "query_index.table.logs.columns.message": "Komunikat",
   "query_index.table.logs.columns.source": "Źródło",
   "query_index.table.logs.columns.timestamp": "Znacznik czasu",
@@ -48,6 +51,7 @@
   "query_index.table.searchPlaceholder": "Filtruj według encji",
   "query_index.table.status.failed": "Niepowodzenie",
   "query_index.table.status.in_sync": "Zsynchronizowany",
+  "query_index.table.status.not_measured": "Jeszcze nie zmierzono",
   "query_index.table.status.out_of_sync": "Poza synchronizacją",
   "query_index.table.status.partitionLabel": "Partycja {{index}}",
   "query_index.table.status.progress": "{{processed}}/{{total}}",
@@ -61,7 +65,5 @@
   "query_index.table.status.scope.stalled": "Zatrzymane",
   "query_index.table.status.scopeLabel": "Zakres",
   "query_index.table.status.stalled": "Zatrzymany",
-  "query_index.table.status.vectorLabel": "Wektor",
-  "query_index.table.status.vectorValue": "{{count}} / {{total}}",
   "query_index.table.status.withProgress": "{{status}} ({{progress}})"
 }

package/src/modules/query_index/lib/batch.ts

@@ -4,6 +4,7 @@ import { isUniqueViolation } from '@open-mercato/shared/lib/db/pg-errors'
 import { buildIndexDocument, type IndexCustomFieldValue } from './document'
 import { replaceSearchTokensForBatch, isSearchDebugEnabled } from './search-tokens'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
 
 const logger = createLogger('query_index').child({ component: 'reindex-batch' })
 
@@ -228,6 +229,7 @@ export async function upsertIndexBatch(
   const basePayloads: IndexRowPayload[] = []
 
   const debugEnabled = isSearchDebugEnabled()
+  const searchConfig = resolveSearchConfig()
 
   for (const row of rows) {
     const recordId = normalizeId(row.id)
@@ -264,10 +266,15 @@ export async function upsertIndexBatch(
       if (!entityRow) return row
       return { ...entityRow, ...row }
     })()
-    let doc = buildIndexDocument(mergedRow, values, {
-      organizationId: scopeOrg ?? null,
-      tenantId: scopeTenant ?? null,
-    })
+    let doc = buildIndexDocument(
+      mergedRow,
+      values,
+      {
+        organizationId: scopeOrg ?? null,
+        tenantId: scopeTenant ?? null,
+      },
+      { entityType, config: searchConfig },
+    )
     let tokenDoc: Record<string, unknown> = doc
     if (typeof options.encryptDoc === 'function') {
       try {

package/src/modules/query_index/lib/coverage.ts

@@ -1,10 +1,12 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
-import { type Kysely, sql } from 'kysely'
+import { type Kysely, type Transaction, sql } from 'kysely'
 import { resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('query_index').child({ component: 'coverage' })
 
+type CoverageExecutor = Kysely<any> | Transaction<any>
+
 export type CoverageScope = {
   entityType: string
   tenantId?: string | null
@@ -95,7 +97,7 @@ function applyOrganizationCondition<QB extends { where: (...args: any[]) => QB }
 }
 
 async function fetchCoverageRow(
-  db: Kysely<any>,
+  db: CoverageExecutor,
   scope: CoverageScope
 ): Promise<(CoverageRow & { organization_id: string | null }) | null> {
   const { entityType, tenantId, organizationId, withDeleted } = scope
@@ -120,7 +122,7 @@ async function fetchCoverageRow(
 }
 
 async function pruneDuplicateCoverageRows(
-  db: Kysely<any>,
+  db: CoverageExecutor,
   scope: CoverageScope,
   keepId: string | null
 ): Promise<void> {
@@ -139,7 +141,7 @@ async function pruneDuplicateCoverageRows(
 }
 
 async function upsertCoverageRow(
-  db: Kysely<any>,
+  db: CoverageExecutor,
   scope: CoverageScope,
   counts: { baseCount: number; indexedCount: number; vectorIndexedCount: number }
 ): Promise<void> {
@@ -260,10 +262,11 @@ export async function readCoverageSnapshots(
 
 export async function applyCoverageAdjustments(
   em: EntityManager,
-  adjustments: CoverageAdjustment[]
+  adjustments: CoverageAdjustment[],
+  options?: { trx?: CoverageExecutor },
 ): Promise<void> {
   if (!adjustments.length) return
-  const db = (em as any).getKysely() as Kysely<any>
+  const db = options?.trx ?? ((em as any).getKysely() as Kysely<any>)
   const aggregated = aggregateAdjustments(adjustments)
   for (const entry of aggregated) {
     const scope = entry.scope
@@ -291,6 +294,19 @@ export async function deleteCoverageForEntity(db: Kysely<any>, entityType: strin
     .execute()
 }
 
+async function deleteCoverageScope(db: Kysely<any>, scope: CoverageScope): Promise<void> {
+  const { entityType, tenantId, organizationId, withDeleted } = scope
+  if (!entityType) return
+  let query = db
+    .deleteFrom('entity_index_coverage' as any)
+    .where('entity_type' as any, '=', entityType)
+    .where('with_deleted' as any, '=', withDeleted === true)
+  query = tenantId == null
+    ? query.where('tenant_id' as any, 'is', null as any)
+    : query.where('tenant_id' as any, '=', tenantId)
+  await applyOrganizationCondition(query as any, 'organization_id', organizationId ?? null).execute()
+}
+
 async function tableHasColumn(db: Kysely<any>, table: string, column: string): Promise<boolean> {
   const key = `${table}.${column}`
   if (COLUMN_CACHE.has(key)) return COLUMN_CACHE.get(key)!
@@ -378,9 +394,9 @@ export async function primeColumnCache(db: Kysely<any>, checks: ColumnCheck[]):
 export async function refreshCoverageSnapshot(
   em: EntityManager,
   scope: CoverageScope,
-): Promise<void> {
+): Promise<{ baseCount: number; indexedCount: number } | null> {
   const entityType = String(scope.entityType || '')
-  if (!entityType) return
+  if (!entityType) return null
   const tenantId = scope.tenantId ?? null
   const organizationId = scope.organizationId ?? null
   const withDeleted = scope.withDeleted === true
@@ -392,22 +408,37 @@ export async function refreshCoverageSnapshot(
   const hasTenant = await tableHasColumn(db, baseTable, 'tenant_id')
   const hasDeleted = await tableHasColumn(db, baseTable, 'deleted_at')
 
-  if (organizationId !== null && !hasOrg) return
-  if (tenantId !== null && !hasTenant) return
+  // A scope the base table cannot express must not narrow the index side either. Index rows
+  // can carry an organization the base table has no column for — `organizations` has no
+  // `organization_id` yet its index rows derive one from the record id. Filtering only the
+  // index side compares two different populations and reports a gap no reindex can close;
+  // returning early instead of recounting left the previous snapshot frozen, which is what
+  // surfaced as a permanent "out of sync" row for `directory:organization`.
+  //
+  // Tenant is different: a base table without `tenant_id` (`user_roles`) cannot be counted
+  // per tenant at all, and writing the cross-tenant total into one tenant's row would leak
+  // another tenant's volume into it. Drop the unusable scoped row instead, leaving only the
+  // global row — which is the one that can be true — rather than freezing a stale count.
+  const scopeOrg = organizationId !== null && hasOrg
+  if (tenantId !== null && !hasTenant) {
+    await deleteCoverageScope(db, { entityType, tenantId, organizationId, withDeleted })
+    return null
+  }
+  const scopeTenant = tenantId !== null && hasTenant
 
   let baseQuery = db
     .selectFrom(`${baseTable} as b` as any)
     .select(sql`count(*)`.as('count'))
-  if (organizationId !== null && hasOrg) baseQuery = baseQuery.where('b.organization_id' as any, '=', organizationId)
-  if (tenantId !== null && hasTenant) baseQuery = baseQuery.where('b.tenant_id' as any, '=', tenantId)
+  if (scopeOrg) baseQuery = baseQuery.where('b.organization_id' as any, '=', organizationId)
+  if (scopeTenant) baseQuery = baseQuery.where('b.tenant_id' as any, '=', tenantId)
   if (!withDeleted && hasDeleted) baseQuery = baseQuery.where('b.deleted_at' as any, 'is', null as any)
 
   let indexQuery = db
     .selectFrom('entity_indexes as ei' as any)
     .select(sql`count(*)`.as('count'))
     .where('ei.entity_type' as any, '=', entityType)
-  if (organizationId !== null) indexQuery = indexQuery.where('ei.organization_id' as any, '=', organizationId)
-  if (tenantId !== null) indexQuery = indexQuery.where('ei.tenant_id' as any, '=', tenantId)
+  if (scopeOrg) indexQuery = indexQuery.where('ei.organization_id' as any, '=', organizationId)
+  if (scopeTenant) indexQuery = indexQuery.where('ei.tenant_id' as any, '=', tenantId)
   if (!withDeleted) indexQuery = indexQuery.where('ei.deleted_at' as any, 'is', null as any)
 
   const vectorCountPromise = (async (): Promise<number | undefined> => {
@@ -450,6 +481,8 @@ export async function refreshCoverageSnapshot(
     indexedCount: indexCount,
     vectorCount,
   })
+
+  return { baseCount, indexedCount: indexCount }
 }
 
 export async function writeCoverageCounts(

package/src/modules/query_index/lib/document.ts

@@ -1,3 +1,9 @@
+import {
+  isSearchFieldBlocklisted,
+  resolveSearchConfig,
+  type SearchConfig,
+} from '@open-mercato/shared/lib/search/config'
+
 export type IndexDocumentScope = {
   organizationId?: string | null
   tenantId?: string | null
@@ -12,6 +18,18 @@ export type IndexCustomFieldValue = {
 
 export const AGGREGATE_SEARCH_FIELD = 'search_text'
 
+/**
+ * Controls which fields may contribute text to the `search_text` aggregate.
+ *
+ * Both properties are optional so existing callers keep working unchanged: an
+ * omitted `config` is resolved from the environment, and an omitted `entityType`
+ * means only the global blocklist entries apply.
+ */
+export type AggregateSearchOptions = {
+  entityType?: string | null
+  config?: SearchConfig
+}
+
 function normalizeScopeValue(value: string | null | undefined): string | null {
   if (value === undefined || value === null || value === '') return null
   return value
@@ -30,7 +48,12 @@ function normalizeValue(value: unknown): unknown {
   return value
 }
 
-function collectAggregateSearchValues(field: string, value: unknown): string[] {
+function collectAggregateSearchValues(
+  field: string,
+  value: unknown,
+  entityType: string | null,
+  config: SearchConfig,
+): string[] {
   const lower = field.toLowerCase()
   if (
     lower === AGGREGATE_SEARCH_FIELD
@@ -43,6 +66,8 @@ function collectAggregateSearchValues(field: string, value: unknown): string[] {
     return []
   }
 
+  if (isSearchFieldBlocklisted(field, entityType, config)) return []
+
   if (typeof value === 'string') {
     const trimmed = value.trim()
     return trimmed.length > 0 ? [trimmed] : []
@@ -58,12 +83,17 @@ function collectAggregateSearchValues(field: string, value: unknown): string[] {
   return []
 }
 
-export function attachAggregateSearchField(doc: Record<string, unknown>): Record<string, unknown> {
+export function attachAggregateSearchField(
+  doc: Record<string, unknown>,
+  options: AggregateSearchOptions = {},
+): Record<string, unknown> {
+  const config = options.config ?? resolveSearchConfig()
+  const entityType = options.entityType ?? null
   const parts: string[] = []
   const seen = new Set<string>()
 
   for (const [field, value] of Object.entries(doc)) {
-    const values = collectAggregateSearchValues(field, value)
+    const values = collectAggregateSearchValues(field, value, entityType, config)
     for (const entry of values) {
       const key = entry.toLowerCase()
       if (seen.has(key)) continue
@@ -83,6 +113,7 @@ export function buildIndexDocument(
   baseRow: Record<string, unknown>,
   customFieldValues: Iterable<IndexCustomFieldValue> = [],
   scope: IndexDocumentScope = {},
+  options: AggregateSearchOptions = {},
 ): Record<string, unknown> {
   const doc: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(baseRow)) {
@@ -123,5 +154,5 @@ export function buildIndexDocument(
     }
   }
 
-  return attachAggregateSearchField(doc)
+  return attachAggregateSearchField(doc, options)
 }