@open-mercato/core 0.6.4-develop.4015.1.efaafadf79 → 0.6.4-develop.4095.1.9c790dc021

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

@@ -14,6 +14,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 { resolveEncryptedSortFields, sortRowsInMemory } from "@open-mercato/shared/lib/query/encrypted-sort";
 function buildFilterableCustomFieldJoins(sources) {
   if (!sources || sources.length === 0) return [];
   return sources.flatMap((source, index) => {
@@ -410,6 +411,26 @@ class HybridQueryEngine {
         if (field === "organization_id" && columns.has("id")) return "id";
         return null;
       };
+      const fallbackOrgId = opts.organizationId ?? (Array.isArray(opts.organizationIds) && opts.organizationIds.length === 1 ? opts.organizationIds[0] : null);
+      const encSvc = this.getEncryptionService();
+      const resolvedSorts = [];
+      for (const sort of opts.sort || []) {
+        const field = String(sort.field);
+        if (field.startsWith("cf:")) {
+          resolvedSorts.push({ ...sort, field });
+        } else {
+          const baseField = resolveBaseColumn(field);
+          if (baseField) resolvedSorts.push({ ...sort, field: baseField });
+        }
+      }
+      const encryptedSortFields = await resolveEncryptedSortFields(
+        encSvc,
+        entity,
+        resolvedSorts.filter((sort) => !sort.field.startsWith("cf:")).map((sort) => sort.field),
+        opts.tenantId ?? null,
+        fallbackOrgId
+      );
+      const requiresPlaintextSort = encryptedSortFields.size > 0;
       const applyBaseScope = (q) => {
         let next = q;
         if (orgScope && hasOrganizationColumn) {
@@ -617,6 +638,9 @@ class HybridQueryEngine {
       const hasCustomFieldFilters = cfFilters.length > 0;
       const canOptimizeCount = !hasCustomFieldFilters && !hasNonBaseSearchSource;
       const selectFieldSet = new Set(opts.fields && opts.fields.length ? opts.fields.map(String) : Array.from(columns.keys()));
+      if (requiresPlaintextSort) {
+        for (const field of encryptedSortFields) selectFieldSet.add(field);
+      }
       if (opts.includeCustomFields === true) {
         const entityIds = Array.from(new Set(indexSources.map((src) => String(src.entityId))));
         try {
@@ -647,7 +671,8 @@ class HybridQueryEngine {
       };
       const applySort = (q) => {
         let next = q;
-        for (const s of opts.sort || []) {
+        if (requiresPlaintextSort) return next;
+        for (const s of resolvedSorts) {
           const fieldName = String(s.field);
           if (fieldName.startsWith("cf:")) {
             const textExpr = this.buildCfTextExprSql(fieldName, indexSources);
@@ -722,7 +747,9 @@ class HybridQueryEngine {
       let dataBuilder = await applyQueryShape(dataRoot);
       dataBuilder = applySelection(dataBuilder);
       dataBuilder = applySort(dataBuilder);
-      dataBuilder = dataBuilder.limit(pageSize).offset((page - 1) * pageSize);
+      if (!requiresPlaintextSort) {
+        dataBuilder = dataBuilder.limit(pageSize).offset((page - 1) * pageSize);
+      }
       if (debugEnabled && sqlDebugEnabled) {
         const compiled = dataBuilder.compile();
         this.debug("query:sql:data", { entity, sql: compiled.sql, bindings: compiled.parameters, page, pageSize });
@@ -736,11 +763,9 @@ class HybridQueryEngine {
       );
       if (debugEnabled) this.debug("query:complete", { entity, total, items: Array.isArray(itemsRaw) ? itemsRaw.length : 0 });
       let items = itemsRaw;
-      const encSvc = this.getEncryptionService();
       const dekKeyCache = /* @__PURE__ */ new Map();
       if (encSvc?.decryptEntityPayload) {
         const decrypt = encSvc.decryptEntityPayload.bind(encSvc);
-        const fallbackOrgId = opts.organizationId ?? (Array.isArray(opts.organizationIds) && opts.organizationIds.length === 1 ? opts.organizationIds[0] : null);
         items = await Promise.all(
           items.map(async (item) => {
             try {
@@ -777,6 +802,9 @@ class HybridQueryEngine {
           })
         );
       }
+      if (requiresPlaintextSort) {
+        items = sortRowsInMemory(items, resolvedSorts).slice((page - 1) * pageSize, page * pageSize);
+      }
       const typedItems = items;
       let result = { items: typedItems, page, pageSize, total };
       if (partialIndexWarning) result.meta = { partialIndexWarning };