@open-mercato/core 0.4.7-develop-78d7541539 → 0.4.7-develop-74069040de

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

@@ -1,3 +1,4 @@
+const AGGREGATE_SEARCH_FIELD = "search_text";
 function normalizeScopeValue(value) {
   if (value === void 0 || value === null || value === "") return null;
   return value;
@@ -10,6 +11,37 @@ function normalizeValue(value) {
   if (value === void 0) return null;
   return value;
 }
+function collectAggregateSearchValues(field, value) {
+  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 (typeof value === "string") {
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? [trimmed] : [];
+  }
+  if (Array.isArray(value)) {
+    return value.filter((entry) => typeof entry === "string").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+  }
+  return [];
+}
+function attachAggregateSearchField(doc) {
+  const parts = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const [field, value] of Object.entries(doc)) {
+    const values = collectAggregateSearchValues(field, value);
+    for (const entry of values) {
+      const key = entry.toLowerCase();
+      if (seen.has(key)) continue;
+      seen.add(key);
+      parts.push(entry);
+    }
+  }
+  if (parts.length > 0) {
+    doc[AGGREGATE_SEARCH_FIELD] = parts.join("\n");
+  }
+  return doc;
+}
 function buildIndexDocument(baseRow, customFieldValues = [], scope = {}) {
   const doc = {};
   for (const [key, value] of Object.entries(baseRow)) {
@@ -43,9 +75,11 @@ function buildIndexDocument(baseRow, customFieldValues = [], scope = {}) {
       doc[key] = values;
     }
   }
-  return doc;
+  return attachAggregateSearchField(doc);
 }
 export {
+  AGGREGATE_SEARCH_FIELD,
+  attachAggregateSearchField,
   buildIndexDocument
 };
 //# sourceMappingURL=document.js.map

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\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\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 doc\n}\n"],
-  "mappings": "AAYA,SAAS,oBAAoB,OAAiD;AAC5E,MAAI,UAAU,UAAa,UAAU,QAAQ,UAAU,GAAI,QAAO;AAClE,SAAO;AACT;AAEA,SAAS,qBACP,YACA,YACS;AACT,MAAI,eAAe,KAAM,QAAO,eAAe;AAC/C,SAAO,eAAe,QAAQ,eAAe;AAC/C;AAEA,SAAS,eAAe,OAAyB;AAC/C,MAAI,UAAU,OAAW,QAAO;AAChC,SAAO;AACT;AAEO,SAAS,mBACd,SACA,oBAAqD,CAAC,GACtD,QAA4B,CAAC,GACJ;AACzB,QAAM,MAA+B,CAAC;AACtC,aAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,OAAO,GAAG;AAClD,QAAI,GAAG,IAAI;AAAA,EACb;AAEA,QAAM,WAAW,oBAAoB,MAAM,kBAAkB,IAAI;AACjE,QAAM,cAAc,oBAAoB,MAAM,YAAY,IAAI;AAE9D,QAAM,UAAU,oBAAI,IAAuB;AAC3C,aAAW,SAAS,mBAAmB;AACrC,UAAM,MAAM,oBAAoB,MAAM,kBAAkB,IAAI;AAC5D,UAAM,SAAS,oBAAoB,MAAM,YAAY,IAAI;AAEzD,QAAI,CAAC,qBAAqB,UAAU,GAAG,EAAG;AAC1C,QAAI,CAAC,qBAAqB,aAAa,MAAM,EAAG;AAEhD,UAAM,YAAY,MAAM,MAAM,GAAG;AACjC,QAAI,SAAS,QAAQ,IAAI,SAAS;AAClC,QAAI,CAAC,QAAQ;AACX,eAAS,CAAC;AACV,cAAQ,IAAI,WAAW,MAAM;AAAA,IAC/B;AAEA,UAAM,EAAE,MAAM,IAAI;AAClB,QAAI,MAAM,QAAQ,KAAK,GAAG;AACxB,iBAAW,SAAS,MAAO,QAAO,KAAK,eAAe,KAAK,CAAC;AAAA,IAC9D,OAAO;AACL,aAAO,KAAK,eAAe,KAAK,CAAC;AAAA,IACnC;AAAA,EACF;AAEA,aAAW,CAAC,KAAK,MAAM,KAAK,QAAQ,QAAQ,GAAG;AAC7C,QAAI,OAAO,WAAW,GAAG;AACvB,UAAI,GAAG,IAAI,OAAO,CAAC;AAAA,IACrB,WAAW,OAAO,SAAS,GAAG;AAC5B,UAAI,GAAG,IAAI;AAAA,IACb;AAAA,EACF;AAEA,SAAO;AACT;",
+  "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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",
   "names": []
 }

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

@@ -461,14 +461,41 @@ class HybridQueryEngine {
         );
       }
       for (const filter of baseFilters) {
-        const baseField = resolveBaseColumn(String(filter.field));
-        if (!baseField) continue;
+        const fieldName = String(filter.field);
+        const baseField = resolveBaseColumn(fieldName);
+        if (!baseField) {
+          builder = this.applyIndexDocFilterFromAlias(
+            knex,
+            builder,
+            "ei",
+            entity,
+            fieldName,
+            filter.op,
+            filter.value,
+            "b.id",
+            searchRuntime
+          );
+          if (optimizedCountBuilder) {
+            optimizedCountBuilder = this.applyIndexDocFilterFromAlias(
+              knex,
+              optimizedCountBuilder,
+              "ei",
+              entity,
+              fieldName,
+              filter.op,
+              filter.value,
+              "b.id",
+              searchRuntime
+            );
+          }
+          continue;
+        }
         const column = qualify(baseField);
         builder = this.applyColumnFilter(builder, column, filter, {
           ...searchRuntime,
           knex,
           entity,
-          field: String(filter.field),
+          field: fieldName,
           recordIdColumn: "b.id"
         });
         if (optimizedCountBuilder) {
@@ -476,7 +503,7 @@ class HybridQueryEngine {
             ...searchRuntime,
             knex,
             entity,
-            field: String(filter.field),
+            field: fieldName,
             recordIdColumn: "b.id"
           });
         }
@@ -961,6 +988,66 @@ class HybridQueryEngine {
         return q;
     }
   }
+  applyIndexDocFilterFromAlias(knex, q, alias, entityType, key, op, value, recordIdColumn, search) {
+    const text = knex.raw(`(${alias}.doc ->> ?)`, [key]);
+    if ((op === "like" || op === "ilike") && search?.enabled && typeof value === "string") {
+      const tokens = tokenizeText(String(value), search.config);
+      const hashes = tokens.hashes;
+      if (hashes.length) {
+        const applied = this.applySearchTokens(q, {
+          knex,
+          entity: entityType,
+          field: key,
+          hashes,
+          recordIdColumn,
+          tenantId: search.tenantId ?? null,
+          organizationScope: search.organizationScope ?? null
+        });
+        this.logSearchDebug("search:index-doc-filter", {
+          entity: entityType,
+          field: key,
+          tokens: tokens.tokens,
+          hashes,
+          applied,
+          tenantId: search.tenantId ?? null,
+          organizationScope: search.organizationScope
+        });
+        if (applied) return q;
+      } else {
+        this.logSearchDebug("search:index-doc-skip-empty-hashes", {
+          entity: entityType,
+          field: key,
+          value
+        });
+      }
+      return q;
+    }
+    switch (op) {
+      case "eq":
+        return q.where(text, "=", value);
+      case "ne":
+        return q.where(text, "!=", value);
+      case "in":
+        return q.whereIn(text, this.toArray(value));
+      case "nin":
+        return q.whereNotIn(text, this.toArray(value));
+      case "like":
+        return q.where(text, "like", value);
+      case "ilike":
+        return q.where(text, "ilike", value);
+      case "exists":
+        return value ? q.whereRaw(`${text.toString()} is not null`) : q.whereRaw(`${text.toString()} is null`);
+      case "gt":
+      case "gte":
+      case "lt":
+      case "lte": {
+        const operator = op === "gt" ? ">" : op === "gte" ? ">=" : op === "lt" ? "<" : "<=";
+        return q.where(text, operator, value);
+      }
+      default:
+        return q;
+    }
+  }
   async queryCustomEntity(entity, opts = {}) {
     const knex = this.getKnex();
     const alias = "ce";