@open-mercato/core 0.6.7-develop.6706.1.b3a4c759bb → 0.6.7-develop.6725.1.07a748cfc2

package/dist/modules/query_index/lib/document.js

@@ -1,3 +1,7 @@
+import {
+  isSearchFieldBlocklisted,
+  resolveSearchConfig
+} from "@open-mercato/shared/lib/search/config";
 const AGGREGATE_SEARCH_FIELD = "search_text";
 function normalizeScopeValue(value) {
   if (value === void 0 || value === null || value === "") return null;
@@ -11,11 +15,12 @@ function normalizeValue(value) {
   if (value === void 0) return null;
   return value;
 }
-function collectAggregateSearchValues(field, value) {
+function collectAggregateSearchValues(field, value, entityType, config) {
   const lower = field.toLowerCase();
   if (lower === AGGREGATE_SEARCH_FIELD || lower === "id" || lower.endsWith("_id") || lower.endsWith(".id") || lower.endsWith("_at") || ["created_at", "updated_at", "deleted_at", "tenant_id", "organization_id"].includes(lower)) {
     return [];
   }
+  if (isSearchFieldBlocklisted(field, entityType, config)) return [];
   if (typeof value === "string") {
     const trimmed = value.trim();
     return trimmed.length > 0 ? [trimmed] : [];
@@ -25,11 +30,13 @@ function collectAggregateSearchValues(field, value) {
   }
   return [];
 }
-function attachAggregateSearchField(doc) {
+function attachAggregateSearchField(doc, options = {}) {
+  const config = options.config ?? resolveSearchConfig();
+  const entityType = options.entityType ?? null;
   const parts = [];
   const seen = /* @__PURE__ */ new Set();
   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;
@@ -42,7 +49,7 @@ function attachAggregateSearchField(doc) {
   }
   return doc;
 }
-function buildIndexDocument(baseRow, customFieldValues = [], scope = {}) {
+function buildIndexDocument(baseRow, customFieldValues = [], scope = {}, options = {}) {
   const doc = {};
   for (const [key, value] of Object.entries(baseRow)) {
     doc[key] = value;
@@ -75,7 +82,7 @@ function buildIndexDocument(baseRow, customFieldValues = [], scope = {}) {
       doc[key] = values;
     }
   }
-  return attachAggregateSearchField(doc);
+  return attachAggregateSearchField(doc, options);
 }
 export {
   AGGREGATE_SEARCH_FIELD,

package/dist/modules/query_index/lib/document.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/query_index/lib/document.ts"],
-  "sourcesContent": ["export type IndexDocumentScope = {\n  organizationId?: string | null\n  tenantId?: string | null\n}\n\nexport type IndexCustomFieldValue = {\n  key: string\n  value: unknown\n  organizationId?: string | null\n  tenantId?: string | null\n}\n\nexport const AGGREGATE_SEARCH_FIELD = 'search_text'\n\nfunction normalizeScopeValue(value: string | null | undefined): string | null {\n  if (value === undefined || value === null || value === '') return null\n  return value\n}\n\nfunction isScopedValueVisible(\n  scopeValue: string | null,\n  fieldValue: string | null,\n): boolean {\n  if (scopeValue === null) return fieldValue === null\n  return fieldValue === null || fieldValue === scopeValue\n}\n\nfunction normalizeValue(value: unknown): unknown {\n  if (value === undefined) return null\n  return value\n}\n\nfunction collectAggregateSearchValues(field: string, value: unknown): string[] {\n  const lower = field.toLowerCase()\n  if (\n    lower === AGGREGATE_SEARCH_FIELD\n    || lower === 'id'\n    || lower.endsWith('_id')\n    || lower.endsWith('.id')\n    || lower.endsWith('_at')\n    || ['created_at', 'updated_at', 'deleted_at', 'tenant_id', 'organization_id'].includes(lower)\n  ) {\n    return []\n  }\n\n  if (typeof value === 'string') {\n    const trimmed = value.trim()\n    return trimmed.length > 0 ? [trimmed] : []\n  }\n\n  if (Array.isArray(value)) {\n    return value\n      .filter((entry): entry is string => typeof entry === 'string')\n      .map((entry) => entry.trim())\n      .filter((entry) => entry.length > 0)\n  }\n\n  return []\n}\n\nexport function attachAggregateSearchField(doc: Record<string, unknown>): Record<string, unknown> {\n  const parts: string[] = []\n  const seen = new Set<string>()\n\n  for (const [field, value] of Object.entries(doc)) {\n    const values = collectAggregateSearchValues(field, value)\n    for (const entry of values) {\n      const key = entry.toLowerCase()\n      if (seen.has(key)) continue\n      seen.add(key)\n      parts.push(entry)\n    }\n  }\n\n  if (parts.length > 0) {\n    doc[AGGREGATE_SEARCH_FIELD] = parts.join('\\n')\n  }\n\n  return doc\n}\n\nexport function buildIndexDocument(\n  baseRow: Record<string, unknown>,\n  customFieldValues: Iterable<IndexCustomFieldValue> = [],\n  scope: IndexDocumentScope = {},\n): Record<string, unknown> {\n  const doc: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(baseRow)) {\n    doc[key] = value\n  }\n\n  const scopeOrg = normalizeScopeValue(scope.organizationId ?? null)\n  const scopeTenant = normalizeScopeValue(scope.tenantId ?? null)\n\n  const grouped = new Map<string, unknown[]>()\n  for (const field of customFieldValues) {\n    const org = normalizeScopeValue(field.organizationId ?? null)\n    const tenant = normalizeScopeValue(field.tenantId ?? null)\n\n    if (!isScopedValueVisible(scopeOrg, org)) continue\n    if (!isScopedValueVisible(scopeTenant, tenant)) continue\n\n    const bucketKey = `cf:${field.key}`\n    let bucket = grouped.get(bucketKey)\n    if (!bucket) {\n      bucket = []\n      grouped.set(bucketKey, bucket)\n    }\n\n    const { value } = field\n    if (Array.isArray(value)) {\n      for (const entry of value) bucket.push(normalizeValue(entry))\n    } else {\n      bucket.push(normalizeValue(value))\n    }\n  }\n\n  for (const [key, values] of grouped.entries()) {\n    if (values.length === 1) {\n      doc[key] = values[0]\n    } else if (values.length > 1) {\n      doc[key] = values\n    }\n  }\n\n  return attachAggregateSearchField(doc)\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import {\n  isSearchFieldBlocklisted,\n  resolveSearchConfig,\n  type SearchConfig,\n} from '@open-mercato/shared/lib/search/config'\n\nexport type IndexDocumentScope = {\n  organizationId?: string | null\n  tenantId?: string | null\n}\n\nexport type IndexCustomFieldValue = {\n  key: string\n  value: unknown\n  organizationId?: string | null\n  tenantId?: string | null\n}\n\nexport const AGGREGATE_SEARCH_FIELD = 'search_text'\n\n/**\n * Controls which fields may contribute text to the `search_text` aggregate.\n *\n * Both properties are optional so existing callers keep working unchanged: an\n * omitted `config` is resolved from the environment, and an omitted `entityType`\n * means only the global blocklist entries apply.\n */\nexport type AggregateSearchOptions = {\n  entityType?: string | null\n  config?: SearchConfig\n}\n\nfunction normalizeScopeValue(value: string | null | undefined): string | null {\n  if (value === undefined || value === null || value === '') return null\n  return value\n}\n\nfunction isScopedValueVisible(\n  scopeValue: string | null,\n  fieldValue: string | null,\n): boolean {\n  if (scopeValue === null) return fieldValue === null\n  return fieldValue === null || fieldValue === scopeValue\n}\n\nfunction normalizeValue(value: unknown): unknown {\n  if (value === undefined) return null\n  return value\n}\n\nfunction collectAggregateSearchValues(\n  field: string,\n  value: unknown,\n  entityType: string | null,\n  config: SearchConfig,\n): string[] {\n  const lower = field.toLowerCase()\n  if (\n    lower === AGGREGATE_SEARCH_FIELD\n    || lower === 'id'\n    || lower.endsWith('_id')\n    || lower.endsWith('.id')\n    || lower.endsWith('_at')\n    || ['created_at', 'updated_at', 'deleted_at', 'tenant_id', 'organization_id'].includes(lower)\n  ) {\n    return []\n  }\n\n  if (isSearchFieldBlocklisted(field, entityType, config)) return []\n\n  if (typeof value === 'string') {\n    const trimmed = value.trim()\n    return trimmed.length > 0 ? [trimmed] : []\n  }\n\n  if (Array.isArray(value)) {\n    return value\n      .filter((entry): entry is string => typeof entry === 'string')\n      .map((entry) => entry.trim())\n      .filter((entry) => entry.length > 0)\n  }\n\n  return []\n}\n\nexport function attachAggregateSearchField(\n  doc: Record<string, unknown>,\n  options: AggregateSearchOptions = {},\n): Record<string, unknown> {\n  const config = options.config ?? resolveSearchConfig()\n  const entityType = options.entityType ?? null\n  const parts: string[] = []\n  const seen = new Set<string>()\n\n  for (const [field, value] of Object.entries(doc)) {\n    const values = collectAggregateSearchValues(field, value, entityType, config)\n    for (const entry of values) {\n      const key = entry.toLowerCase()\n      if (seen.has(key)) continue\n      seen.add(key)\n      parts.push(entry)\n    }\n  }\n\n  if (parts.length > 0) {\n    doc[AGGREGATE_SEARCH_FIELD] = parts.join('\\n')\n  }\n\n  return doc\n}\n\nexport function buildIndexDocument(\n  baseRow: Record<string, unknown>,\n  customFieldValues: Iterable<IndexCustomFieldValue> = [],\n  scope: IndexDocumentScope = {},\n  options: AggregateSearchOptions = {},\n): Record<string, unknown> {\n  const doc: Record<string, unknown> = {}\n  for (const [key, value] of Object.entries(baseRow)) {\n    doc[key] = value\n  }\n\n  const scopeOrg = normalizeScopeValue(scope.organizationId ?? null)\n  const scopeTenant = normalizeScopeValue(scope.tenantId ?? null)\n\n  const grouped = new Map<string, unknown[]>()\n  for (const field of customFieldValues) {\n    const org = normalizeScopeValue(field.organizationId ?? null)\n    const tenant = normalizeScopeValue(field.tenantId ?? null)\n\n    if (!isScopedValueVisible(scopeOrg, org)) continue\n    if (!isScopedValueVisible(scopeTenant, tenant)) continue\n\n    const bucketKey = `cf:${field.key}`\n    let bucket = grouped.get(bucketKey)\n    if (!bucket) {\n      bucket = []\n      grouped.set(bucketKey, bucket)\n    }\n\n    const { value } = field\n    if (Array.isArray(value)) {\n      for (const entry of value) bucket.push(normalizeValue(entry))\n    } else {\n      bucket.push(normalizeValue(value))\n    }\n  }\n\n  for (const [key, values] of grouped.entries()) {\n    if (values.length === 1) {\n      doc[key] = values[0]\n    } else if (values.length > 1) {\n      doc[key] = values\n    }\n  }\n\n  return attachAggregateSearchField(doc, options)\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/query_index/lib/engine.js

@@ -15,6 +15,7 @@ import {
 import { resolveSearchConfig } from "@open-mercato/shared/lib/search/config";
 import { tokenizeText } from "@open-mercato/shared/lib/search/tokenize";
 import { runBeforeQueryPipeline, runAfterQueryPipeline } from "@open-mercato/shared/lib/query/query-extension-runner";
+import { warnOnCiphertextLikeFallback } from "@open-mercato/shared/lib/query/ciphertext-search-warning";
 import { resolveEncryptedSortFields, resolveEncryptedSortMaxRows, sortRowsInMemory } from "@open-mercato/shared/lib/query/encrypted-sort";
 import { mapWithConcurrency } from "@open-mercato/shared/lib/query/bounded-decrypt";
 import { createLogger } from "@open-mercato/shared/lib/logger";
@@ -316,10 +317,10 @@ class HybridQueryEngine {
         }
       }
       const searchSources = indexSources.map((src) => ({ entity: String(src.entityId), recordIdColumn: src.recordIdColumn })).filter((src) => src.recordIdColumn && src.entity);
-      const hasSearchTokens = searchEnabled && searchSources.length ? await this.searchSourcesHaveTokens(searchSources, opts.tenantId ?? null, orgScope) : false;
+      const searchFilters = normalizedFilters.filter((filter) => filter.op === "like" || filter.op === "ilike");
+      const hasSearchTokens = searchEnabled && searchSources.length && searchFilters.length ? await this.searchSourcesHaveTokens(searchSources, opts.tenantId ?? null, orgScope) : false;
       const searchRuntime = { ...searchRuntimeBase, searchSources, enabled: searchEnabled && hasSearchTokens };
       const joinSearchAvailability = /* @__PURE__ */ new Map();
-      const searchFilters = normalizeFilters(opts.filters).filter((filter) => filter.op === "like" || filter.op === "ilike");
       if (searchFilters.length) {
         this.logSearchDebug("search:init", {
           entity,
@@ -346,6 +347,36 @@ class HybridQueryEngine {
           organizationScope: orgScope,
           searchSources
         });
+        const baseSearchFilters = [...baseFilters, ...cfFilters].filter((filter) => filter.op === "like" || filter.op === "ilike");
+        const fallbackFields = baseSearchFilters.filter((filter) => !searchRuntime.enabled || typeof filter.value !== "string" || tokenizeText(filter.value, searchConfig).hashes.length === 0).map((filter) => String(filter.field));
+        if (fallbackFields.length) {
+          await warnOnCiphertextLikeFallback({
+            entity: String(entity),
+            fields: fallbackFields,
+            tenantId: opts.tenantId ?? null,
+            // `searchEnabled` also folds in the missing-table case, which is
+            // "no usable tokens" rather than "the operator switched search off".
+            reason: searchRuntime.enabled ? "no-indexable-tokens" : searchConfig.enabled ? "no-search-tokens" : "search-disabled",
+            service: this.getEncryptionService()
+          });
+        }
+      }
+      for (const [alias, joinedFilters] of joinFilters) {
+        const filters = joinedFilters.filter((entry) => entry.op === "like" || entry.op === "ilike");
+        if (!filters.length) continue;
+        const join = joinMap.get(alias);
+        if (!join?.entityId) continue;
+        const hasJoinedTokens = searchEnabled ? await this.hasSearchTokens(String(join.entityId), opts.tenantId ?? null, orgScope) : false;
+        joinSearchAvailability.set(String(join.entityId), hasJoinedTokens);
+        const fallbackFields = filters.filter((filter) => !hasJoinedTokens || typeof filter.value !== "string" || tokenizeText(filter.value, searchConfig).hashes.length === 0).map((filter) => filter.column);
+        if (!fallbackFields.length) continue;
+        await warnOnCiphertextLikeFallback({
+          entity: String(join.entityId),
+          fields: fallbackFields,
+          tenantId: opts.tenantId ?? null,
+          reason: hasJoinedTokens ? "no-indexable-tokens" : searchConfig.enabled ? "no-search-tokens" : "search-disabled",
+          service: this.getEncryptionService()
+        });
       }
       const hasNonBaseSearchSource = searchSources.some(
         (src) => src.entity !== String(entity) || src.recordIdColumn !== "b.id"
@@ -1356,9 +1387,11 @@ class HybridQueryEngine {
     const alias = "ce";
     const orgScope = this.resolveOrganizationScope(opts);
     if (!opts.tenantId) throw new Error("QueryEngine: tenantId is required");
+    const normalizedFilters = normalizeFilters(opts.filters);
+    const hasSearchFilter = normalizedFilters.some((filter) => filter.op === "like" || filter.op === "ilike");
     const searchConfig = resolveSearchConfig();
     const searchEnabled = searchConfig.enabled && await this.tableExists("search_tokens");
-    const hasSearchTokens = searchEnabled ? await this.hasSearchTokens(entity, opts.tenantId ?? null, orgScope) : false;
+    const hasSearchTokens = searchEnabled && hasSearchFilter ? await this.hasSearchTokens(entity, opts.tenantId ?? null, orgScope) : false;
     const searchRuntime = {
       enabled: searchEnabled && hasSearchTokens,
       config: searchConfig,
@@ -1366,7 +1399,6 @@ class HybridQueryEngine {
       tenantId: opts.tenantId ?? null,
       mintAlias: createSearchAliasMinter()
     };
-    const normalizedFilters = normalizeFilters(opts.filters);
     const applyScope = (q) => {
       let next = q.where(`${alias}.entity_type`, "=", entity).where(`${alias}.tenant_id`, "=", opts.tenantId);
       if (orgScope) {