@open-mercato/shared 0.8.1-develop.7294.1.0ef99fc518 → 0.8.1-develop.7296.1.2111d779db

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
 [generate-countries] up to date (259 countries)
-[build:shared] found 298 entry points
+[build:shared] found 299 entry points
 [build:shared] built successfully

package/AGENTS.md

@@ -124,9 +124,12 @@ index stores hashes of the plaintext, so it keeps matching. Issue #2990.
 - `matched: true` with `ids: []` is a real empty result.
 - Queries that go through the query engine get this routing automatically; raw
   `em.find` / Kysely list routes must wire it themselves. One carve-out: with
-  `OM_SEARCH_USE_ILIKE_FOR_NON_ENCRYPTED_FIELDS=true` (default false), a base-column
-  `like`/`ilike` on a **plaintext** column runs as exact SQL ILIKE instead of the token
-  rewrite — encrypted columns keep the token path either way. When the fallback would run
+  `OM_SEARCH_USE_ILIKE_FOR_NON_ENCRYPTED_FIELDS=true` (**off by default per #5383**, opt in ahead
+  of it to fix #5803), a base-column `like`/`ilike` on a **plaintext** column runs as SQL ILIKE —
+  one containment predicate per word of the term, ANDed (`lib/search/containment`), so word-order
+  independence survives the reroute — instead of the token rewrite; encrypted columns keep the
+  token path either way. Leaving the var unset keeps the legacy rewrite-everything behavior. When
+  the fallback would run
   `ILIKE` against an encrypted column, both query engines now log a warning
   (`lib/query/ciphertext-search-warning`) instead of degrading silently.
 - The `…WithDecryption` helpers log the same warning outside production when the `where`

package/dist/lib/query/encrypted-sort.js

@@ -5,7 +5,10 @@ function fieldNameCandidates(field) {
   const raw = String(field || "").trim();
   if (!raw) return [];
   const candidates = [raw, toSnakeCase(raw), toCamelCase(raw)];
-  if (raw.startsWith("cf:")) candidates.push(raw.replace(/[^a-zA-Z0-9_]/g, "_"));
+  if (raw.startsWith("cf:")) {
+    const sanitized = raw.replace(/[^a-zA-Z0-9_]/g, "_");
+    candidates.push(sanitized, `${sanitized}__sort`);
+  }
   return Array.from(new Set(candidates));
 }
 function resolveEncryptedSortMaxRows() {

package/dist/lib/query/encrypted-sort.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/query/encrypted-sort.ts"],
-  "sourcesContent": ["import type { EntityId } from '@open-mercato/shared/modules/entities'\nimport { SortDir, type Sort } from './types'\n\nexport type QueryEncryptionService = {\n  getEncryptedFieldNames?: (\n    entityId: EntityId,\n    tenantId?: string | null,\n    organizationId?: string | null,\n  ) => Promise<readonly string[]>\n  isEnabled?: () => boolean\n}\n\nconst toSnakeCase = (value: string): string =>\n  value.replace(/([A-Z])/g, '_$1').replace(/__/g, '_').toLowerCase()\n\nconst toCamelCase = (value: string): string =>\n  value.replace(/_([a-z])/g, (_, c) => c.toUpperCase())\n\nexport function fieldNameCandidates(field: string): string[] {\n  const raw = String(field || '').trim()\n  if (!raw) return []\n  const candidates = [raw, toSnakeCase(raw), toCamelCase(raw)]\n  if (raw.startsWith('cf:')) candidates.push(raw.replace(/[^a-zA-Z0-9_]/g, '_'))\n  return Array.from(new Set(candidates))\n}\n\n/**\n * Opt-in cap on how many candidate rows the plaintext-sort path may fetch\n * for sort-column decryption. Unset or invalid input means uncapped \u2014 the\n * default must stay byte-identical to the pre-cap behavior.\n */\nexport function resolveEncryptedSortMaxRows(): number | null {\n  const raw = process.env.OM_ENCRYPTED_SORT_MAX_ROWS\n  if (raw === undefined || raw === '') return null\n  const parsed = Number(raw)\n  if (!Number.isFinite(parsed) || parsed <= 0) return null\n  return Math.floor(parsed)\n}\n\nexport async function resolveEncryptedSortFields(\n  service: QueryEncryptionService | null | undefined,\n  entity: EntityId,\n  sortFields: readonly string[],\n  tenantId?: string | null,\n  organizationId?: string | null,\n): Promise<Set<string>> {\n  if (!service?.getEncryptedFieldNames) return new Set()\n  if (service.isEnabled && !service.isEnabled()) return new Set()\n  const encrypted = await service.getEncryptedFieldNames(entity, tenantId ?? null, organizationId ?? null)\n  const encryptedCandidates = new Set<string>()\n  for (const field of encrypted) {\n    for (const candidate of fieldNameCandidates(field)) encryptedCandidates.add(candidate)\n  }\n  const result = new Set<string>()\n  for (const field of sortFields) {\n    if (field.startsWith('cf:')) continue\n    const matches = fieldNameCandidates(field).some((candidate) => encryptedCandidates.has(candidate))\n    if (matches) result.add(field)\n  }\n  return result\n}\n\nfunction readField(row: Record<string, unknown>, field: string): unknown {\n  for (const candidate of fieldNameCandidates(field)) {\n    if (Object.prototype.hasOwnProperty.call(row, candidate)) return row[candidate]\n  }\n  return undefined\n}\n\nfunction compareValues(left: unknown, right: unknown): number {\n  const leftMissing = left === null || left === undefined\n  const rightMissing = right === null || right === undefined\n  if (leftMissing && rightMissing) return 0\n  if (leftMissing) return 1\n  if (rightMissing) return -1\n  if (left instanceof Date && right instanceof Date) return left.getTime() - right.getTime()\n  if (typeof left === 'number' && typeof right === 'number') return left - right\n  if (typeof left === 'boolean' && typeof right === 'boolean') return Number(left) - Number(right)\n  return String(left).localeCompare(String(right), undefined, {\n    sensitivity: 'base',\n    numeric: true,\n  })\n}\n\nexport function sortRowsInMemory<T extends Record<string, unknown>>(\n  rows: readonly T[],\n  sorts: readonly Sort[],\n): T[] {\n  return [...rows].sort((left, right) => {\n    for (const sort of sorts) {\n      const direction = sort.dir === SortDir.Desc ? -1 : 1\n      const compared = compareValues(readField(left, sort.field), readField(right, sort.field))\n      if (compared !== 0) return compared * direction\n    }\n    const leftId = readField(left, 'id')\n    const rightId = readField(right, 'id')\n    return compareValues(leftId, rightId)\n  })\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import type { EntityId } from '@open-mercato/shared/modules/entities'\nimport { SortDir, type Sort } from './types'\n\nexport type QueryEncryptionService = {\n  getEncryptedFieldNames?: (\n    entityId: EntityId,\n    tenantId?: string | null,\n    organizationId?: string | null,\n  ) => Promise<readonly string[]>\n  isEnabled?: () => boolean\n}\n\nconst toSnakeCase = (value: string): string =>\n  value.replace(/([A-Z])/g, '_$1').replace(/__/g, '_').toLowerCase()\n\nconst toCamelCase = (value: string): string =>\n  value.replace(/_([a-z])/g, (_, c) => c.toUpperCase())\n\nexport function fieldNameCandidates(field: string): string[] {\n  const raw = String(field || '').trim()\n  if (!raw) return []\n  const candidates = [raw, toSnakeCase(raw), toCamelCase(raw)]\n  if (raw.startsWith('cf:')) {\n    const sanitized = raw.replace(/[^a-zA-Z0-9_]/g, '_')\n    // The ORM query engine's plaintext-sort candidate scan projects a `cf:`\n    // sort key only under its dedicated `<alias>__sort` projection alias, never\n    // the plain jsonb-aggregate alias \u2014 so the in-memory sort needs that exact\n    // name to find the value on the phase-1 candidate rows (#5674 review).\n    candidates.push(sanitized, `${sanitized}__sort`)\n  }\n  return Array.from(new Set(candidates))\n}\n\n/**\n * Opt-in cap on how many candidate rows the plaintext-sort path may fetch\n * for sort-column decryption. Unset or invalid input means uncapped \u2014 the\n * default must stay byte-identical to the pre-cap behavior.\n */\nexport function resolveEncryptedSortMaxRows(): number | null {\n  const raw = process.env.OM_ENCRYPTED_SORT_MAX_ROWS\n  if (raw === undefined || raw === '') return null\n  const parsed = Number(raw)\n  if (!Number.isFinite(parsed) || parsed <= 0) return null\n  return Math.floor(parsed)\n}\n\nexport async function resolveEncryptedSortFields(\n  service: QueryEncryptionService | null | undefined,\n  entity: EntityId,\n  sortFields: readonly string[],\n  tenantId?: string | null,\n  organizationId?: string | null,\n): Promise<Set<string>> {\n  if (!service?.getEncryptedFieldNames) return new Set()\n  if (service.isEnabled && !service.isEnabled()) return new Set()\n  const encrypted = await service.getEncryptedFieldNames(entity, tenantId ?? null, organizationId ?? null)\n  const encryptedCandidates = new Set<string>()\n  for (const field of encrypted) {\n    for (const candidate of fieldNameCandidates(field)) encryptedCandidates.add(candidate)\n  }\n  const result = new Set<string>()\n  for (const field of sortFields) {\n    if (field.startsWith('cf:')) continue\n    const matches = fieldNameCandidates(field).some((candidate) => encryptedCandidates.has(candidate))\n    if (matches) result.add(field)\n  }\n  return result\n}\n\nfunction readField(row: Record<string, unknown>, field: string): unknown {\n  for (const candidate of fieldNameCandidates(field)) {\n    if (Object.prototype.hasOwnProperty.call(row, candidate)) return row[candidate]\n  }\n  return undefined\n}\n\nfunction compareValues(left: unknown, right: unknown): number {\n  const leftMissing = left === null || left === undefined\n  const rightMissing = right === null || right === undefined\n  if (leftMissing && rightMissing) return 0\n  if (leftMissing) return 1\n  if (rightMissing) return -1\n  if (left instanceof Date && right instanceof Date) return left.getTime() - right.getTime()\n  if (typeof left === 'number' && typeof right === 'number') return left - right\n  if (typeof left === 'boolean' && typeof right === 'boolean') return Number(left) - Number(right)\n  return String(left).localeCompare(String(right), undefined, {\n    sensitivity: 'base',\n    numeric: true,\n  })\n}\n\nexport function sortRowsInMemory<T extends Record<string, unknown>>(\n  rows: readonly T[],\n  sorts: readonly Sort[],\n): T[] {\n  return [...rows].sort((left, right) => {\n    for (const sort of sorts) {\n      const direction = sort.dir === SortDir.Desc ? -1 : 1\n      const compared = compareValues(readField(left, sort.field), readField(right, sort.field))\n      if (compared !== 0) return compared * direction\n    }\n    const leftId = readField(left, 'id')\n    const rightId = readField(right, 'id')\n    return compareValues(leftId, rightId)\n  })\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/lib/query/engine.js

@@ -11,11 +11,13 @@ import {
   isSearchFilterOp
 } from "../search/availability.js";
 import { tokenizeText } from "../search/tokenize.js";
+import { buildContainmentPatterns } from "../search/containment.js";
 import { fieldNameCandidates } from "./encrypted-sort.js";
 import { isTenantDataEncryptionEnabled } from "../encryption/toggles.js";
 import { runBeforeQueryPipeline, runAfterQueryPipeline } from "./query-extension-runner.js";
 import {
   buildCustomFieldDefinitionIndexFromRows,
+  normalizeDefinitionKey,
   resolveCfDefIndexOrgCandidates
 } from "../crud/custom-field-definition-index.js";
 import { warnOnCiphertextLikeFallback } from "./ciphertext-search-warning.js";
@@ -158,6 +160,17 @@ function buildFilterableCustomFieldJoins(sources) {
     }];
   });
 }
+const NUMERIC_CF_SORT_KINDS = /* @__PURE__ */ new Set(["integer", "float"]);
+function pickCfSortKind(defs) {
+  if (!defs || !defs.length) return null;
+  let winner = null;
+  for (const def of defs) {
+    if (!def.kind) continue;
+    const specificity = def.organizationId != null ? 2 : def.tenantId != null ? 1 : 0;
+    if (!winner || specificity >= winner.specificity) winner = { kind: def.kind, specificity };
+  }
+  return winner?.kind ?? null;
+}
 function computeCustomFieldScore(cfg, kind, entityIndex) {
   const listVisibleScore = cfg.listVisible === false ? 0 : 1;
   const formEditableScore = cfg.formEditable === false ? 0 : 1;
@@ -409,6 +422,14 @@ class BasicQueryEngine {
           });
         }
       }
+      if ((op === "like" || op === "ilike") && typeof value === "string" && searchActive && fieldName && encryptedLikeFields !== null && !isEncryptedLikeField(encryptedLikeFields, fieldName)) {
+        const patterns = buildContainmentPatterns(value);
+        if (patterns.length > 1) {
+          let next = builder;
+          for (const pattern of patterns) next = this.applyColumnOp(next, column, op, pattern);
+          return next;
+        }
+      }
       return this.applyColumnOp(builder, column, op, value);
     };
     const applyJoinFilterOp = async (builder, filter, _qualified, join) => {
@@ -680,10 +701,46 @@ class BasicQueryEngine {
           if (!keySource.has(row.key)) keySource.set(row.key, source);
         }
       }
+      const cfSortKeys = Array.from(new Set(
+        resolvedSorts.filter((sort) => sort.field.startsWith("cf:")).map((sort) => sort.field.slice(3))
+      ));
+      const cfSortKinds = /* @__PURE__ */ new Map();
+      if (cfSortKeys.length > 0) {
+        const keysNeedingQuery = [];
+        for (const key of cfSortKeys) {
+          const kind = resolvedCustomFieldDefinitions2 ? pickCfSortKind(resolvedCustomFieldDefinitions2.index.get(normalizeDefinitionKey(key))) : null;
+          if (kind) cfSortKinds.set(key, kind);
+          else keysNeedingQuery.push(key);
+        }
+        if (keysNeedingQuery.length > 0) {
+          const sortEntityIds = Array.from(new Set(
+            keysNeedingQuery.map((key) => keySource.get(key)?.entityId).filter((id) => Boolean(id)).map((id) => String(id))
+          ));
+          if (sortEntityIds.length > 0) {
+            const cfSortOrgCandidates = resolveCfDefIndexOrgCandidates(opts.organizationIds, opts.organizationId ?? null);
+            const kindRows = await db.selectFrom("custom_field_defs").select(["key", "kind", "organization_id", "tenant_id"]).where("entity_id", "in", sortEntityIds).where("key", "in", keysNeedingQuery).where("is_active", "=", true).where((eb) => eb.or([
+              eb("tenant_id", "=", tenantId),
+              eb("tenant_id", "is", null)
+            ])).where((eb) => cfSortOrgCandidates.length ? eb.or([
+              eb("organization_id", "is", null),
+              eb("organization_id", "in", cfSortOrgCandidates)
+            ]) : eb("organization_id", "is", null)).execute();
+            const winners = /* @__PURE__ */ new Map();
+            for (const row of kindRows) {
+              if (!row.kind) continue;
+              const specificity = row.organization_id != null ? 2 : row.tenant_id != null ? 1 : 0;
+              const existing = winners.get(row.key);
+              if (!existing || specificity >= existing.specificity) winners.set(row.key, { kind: row.kind, specificity });
+            }
+            for (const [key, entry] of winners) cfSortKinds.set(key, entry.kind);
+          }
+        }
+      }
       const cfValueExprByKey = {};
       const cfSelectedAliases = [];
       const cfJsonAliases2 = /* @__PURE__ */ new Set();
       const cfMultiAliasByAlias2 = /* @__PURE__ */ new Map();
+      const cfSortAliases2 = [];
       for (const key of cfKeys) {
         const source = keySource.get(key);
         if (!source) continue;
@@ -839,29 +896,50 @@ class BasicQueryEngine {
           );
         }
       }
+      let lastEmittedSortField = null;
       for (const s of isCountProjection ? [] : resolvedSorts) {
         if (s.field.startsWith("cf:")) {
           const key = s.field.slice(3);
-          const alias = sanitize(`cf:${key}`);
-          if (!cfSelectedAliases.includes(alias)) {
-            const expr = cfValueExprByKey[key];
-            if (expr) {
-              q = q.select(sql`max(${expr})`.as(alias));
-              cfSelectedAliases.push(alias);
+          const sortAlias = sanitize(`cf:${key}__sort`);
+          if (!cfSortAliases2.includes(sortAlias)) {
+            const source = keySource.get(key);
+            const kind = cfSortKinds.get(key);
+            let sortExpr = null;
+            if (source && kind && NUMERIC_CF_SORT_KINDS.has(kind)) {
+              const sourceAliasSafe = sanitize(source.alias || "src");
+              const keyAliasSafe = sanitize(key);
+              const valAlias = `cfv_${sourceAliasSafe}_${keyAliasSafe}`;
+              const numericColumn = kind === "integer" ? "value_int" : "value_float";
+              sortExpr = sql`max((${sql.ref(`${valAlias}.${numericColumn}`)})::numeric)`;
+            } else {
+              const expr = cfValueExprByKey[key];
+              if (expr) sortExpr = sql`max(${expr})`;
+            }
+            if (sortExpr) {
+              q = q.select(sortExpr.as(sortAlias));
+              cfSortAliases2.push(sortAlias);
             }
           }
-          if (!requiresPlaintextSort && cfSelectedAliases.includes(alias)) {
-            q = q.orderBy(alias, s.dir ?? "asc");
+          if (!requiresPlaintextSort && cfSortAliases2.includes(sortAlias)) {
+            const direction = sql.raw((s.dir ?? "asc") === "desc" ? "desc" : "asc");
+            q = q.orderBy(sql`${sql.ref(sortAlias)} ${direction} NULLS LAST`);
+            lastEmittedSortField = s.field;
           }
         } else {
-          if (!requiresPlaintextSort) q = q.orderBy(qualify(s.field), s.dir ?? "asc");
+          if (!requiresPlaintextSort) {
+            q = q.orderBy(qualify(s.field), s.dir ?? "asc");
+            lastEmittedSortField = s.field;
+          }
         }
       }
+      if (!isCountProjection && lastEmittedSortField !== null && lastEmittedSortField !== "id") {
+        q = q.orderBy(qualify("id"), "asc");
+      }
       const hasJoinedAggregates2 = !isCountProjection && (opts.includeExtensions && (Array.isArray(opts.includeExtensions) ? opts.includeExtensions.length > 0 : true) || Object.keys(cfValueExprByKey).length > 0);
       if (hasJoinedAggregates2) {
         q = q.groupBy(`${table}.id`);
       }
-      return { builder: q, hasJoinedAggregates: hasJoinedAggregates2, cfJsonAliases: cfJsonAliases2, cfMultiAliasByAlias: cfMultiAliasByAlias2, resolvedCustomFieldDefinitions: resolvedCustomFieldDefinitions2 };
+      return { builder: q, hasJoinedAggregates: hasJoinedAggregates2, cfJsonAliases: cfJsonAliases2, cfMultiAliasByAlias: cfMultiAliasByAlias2, cfSortAliases: cfSortAliases2, resolvedCustomFieldDefinitions: resolvedCustomFieldDefinitions2 };
     };
     const page = opts.page?.page ?? 1;
     const pageSize = opts.page?.pageSize ?? 20;
@@ -870,6 +948,7 @@ class BasicQueryEngine {
       hasJoinedAggregates,
       cfJsonAliases,
       cfMultiAliasByAlias,
+      cfSortAliases,
       resolvedCustomFieldDefinitions
     } = await buildQuery("full");
     const countCap = resolveListCountCap();
@@ -932,6 +1011,12 @@ class BasicQueryEngine {
         }
       }
     };
+    const stripCfSortAliases = (rows) => {
+      if (cfSortAliases.length === 0) return;
+      for (const row of rows) {
+        for (const alias of cfSortAliases) delete row[alias];
+      }
+    };
     let pagedItems;
     let encryptedSortRowCapWarning;
     if (requiresPlaintextSort) {
@@ -959,6 +1044,7 @@ class BasicQueryEngine {
       } else {
         const pageRows = await qFull.where(qualify("id"), "in", pageIds).execute();
         normalizeCfJsonAliases(pageRows);
+        stripCfSortAliases(pageRows);
         const decryptedPageRows = decryptPayload ? await mapWithConcurrency(pageRows, DECRYPT_CONCURRENCY, decryptRow) : pageRows;
         const byId = new Map(decryptedPageRows.map((row) => [String(row.id), row]));
         pagedItems = pageIds.map((id) => byId.get(String(id))).filter((row) => row != null);
@@ -967,6 +1053,7 @@ class BasicQueryEngine {
       const dataQuery = qFull.limit(pageSize).offset((page - 1) * pageSize);
       const items = await dataQuery.execute();
       normalizeCfJsonAliases(items);
+      stripCfSortAliases(items);
       pagedItems = decryptPayload ? await mapWithConcurrency(items, DECRYPT_CONCURRENCY, decryptRow) : items;
     }
     let queryResult = { items: pagedItems, page, pageSize, total };