@open-mercato/shared 0.6.5-develop.5337.1.534b781eac → 0.6.5-develop.5382.1.f542de69af

package/src/lib/query/advanced-filter.ts

@@ -1,4 +1,4 @@
-import { escapeLikePattern } from '../db/escapeLikePattern'
+import { buildIlikeTerm } from '../db/buildIlikeTerm'
 
 export type FilterOperator =
   | 'is' | 'is_not' | 'contains' | 'does_not_contain' | 'starts_with' | 'ends_with' | 'is_empty' | 'is_not_empty'
@@ -190,19 +190,19 @@ function buildConditionFilter(condition: FilterCondition): Record<string, unknow
       break
     case 'contains':
       if (normalizeSingleValue(condition.value) === null) return null
-      filter[condition.field] = { $ilike: `%${escapeLikePattern(String(normalizeSingleValue(condition.value)))}%` }
+      filter[condition.field] = { $ilike: buildIlikeTerm(String(normalizeSingleValue(condition.value))) }
       break
     case 'does_not_contain':
       if (normalizeSingleValue(condition.value) === null) return null
-      filter[condition.field] = { $not: { $ilike: `%${escapeLikePattern(String(normalizeSingleValue(condition.value)))}%` } }
+      filter[condition.field] = { $not: { $ilike: buildIlikeTerm(String(normalizeSingleValue(condition.value))) } }
       break
     case 'starts_with':
       if (normalizeSingleValue(condition.value) === null) return null
-      filter[condition.field] = { $ilike: `${escapeLikePattern(String(normalizeSingleValue(condition.value)))}%` }
+      filter[condition.field] = { $ilike: buildIlikeTerm(String(normalizeSingleValue(condition.value)), 'startsWith') }
       break
     case 'ends_with':
       if (normalizeSingleValue(condition.value) === null) return null
-      filter[condition.field] = { $ilike: `%${escapeLikePattern(String(normalizeSingleValue(condition.value)))}` }
+      filter[condition.field] = { $ilike: buildIlikeTerm(String(normalizeSingleValue(condition.value)), 'endsWith') }
       break
     case 'is_empty':
       filter[condition.field] = { $exists: false }

package/src/lib/query/engine.ts

@@ -844,9 +844,20 @@ export class BasicQueryEngine implements QueryEngine {
     if (hasJoinedAggregates) {
       q = q.groupBy(`${table}.id`)
     }
+    // `count(distinct base.id)` is only required when a join can multiply base rows
+    // (CF/extension aggregates, explicit relation joins, or custom-field sources).
+    // Without such joins base.id is the unique PK, so `count(*)` is equivalent and
+    // lets Postgres skip the redundant DISTINCT sort/hash for an index-only count (#2227).
+    const mayMultiplyBaseRows =
+      hasJoinedAggregates ||
+      (Array.isArray(opts.joins) && opts.joins.length > 0) ||
+      (Array.isArray(opts.customFieldSources) && opts.customFieldSources.length > 0)
+    const countExpr = mayMultiplyBaseRows
+      ? sql<string>`count(distinct ${sql.ref(`${table}.id`)})`
+      : sql<string>`count(*)`
     const countBuilder = hasJoinedAggregates
-      ? q.clearSelect().clearOrderBy().clearGroupBy().select(sql<string>`count(distinct ${sql.ref(`${table}.id`)})`.as('count'))
-      : q.clearSelect().clearOrderBy().select(sql<string>`count(distinct ${sql.ref(`${table}.id`)})`.as('count'))
+      ? q.clearSelect().clearOrderBy().clearGroupBy().select(countExpr.as('count'))
+      : q.clearSelect().clearOrderBy().select(countExpr.as('count'))
     const countRow = await countBuilder.executeTakeFirst() as { count: unknown } | undefined
     const total = Number((countRow as any)?.count ?? 0)
     const dataQuery = requiresPlaintextSort

package/src/modules/__tests__/overrides.test.ts

@@ -6,7 +6,7 @@
  * by shared's default appliers; custom/future domains still warn if no
  * applier is registered.
  *
- * Spec: `.ai/specs/2026-05-04-modules-ts-unified-overrides.md`.
+ * Spec: `.ai/specs/implemented/2026-05-04-modules-ts-unified-overrides.md`.
  */
 import {
   applyModuleOverridesFromEnabledModules,

package/src/modules/__tests__/route-overrides.test.ts

@@ -12,7 +12,7 @@
  *   - `registerApiRouteManifests` consults the override composer.
  *   - Stale override keys emit a warning so operators notice.
  *
- * Spec: `.ai/specs/2026-05-04-modules-ts-unified-overrides.md`.
+ * Spec: `.ai/specs/implemented/2026-05-04-modules-ts-unified-overrides.md`.
  */
 import {
   applyApiOverridesToManifests,

package/src/modules/overrides.ts

@@ -2,7 +2,7 @@
  * Unified `modules.ts` override surface — one place for downstream apps to
  * replace or disable any contract a module presents.
  *
- * Spec: `.ai/specs/2026-05-04-modules-ts-unified-overrides.md`
+ * Spec: `.ai/specs/implemented/2026-05-04-modules-ts-unified-overrides.md`
  *
  * Each `ModuleEntry` in `apps/<app>/src/modules.ts` may carry an
  * `overrides` field whose sub-keys address one domain at a time:
@@ -229,7 +229,7 @@ const DOMAIN_KEYS: ModuleOverrideDomain[] = [
 ]
 
 const TRACKING_ISSUE_HINT =
-  'See `.ai/specs/2026-05-04-modules-ts-unified-overrides.md` and tracking issue https://github.com/open-mercato/open-mercato/issues/1787.'
+  'See `.ai/specs/implemented/2026-05-04-modules-ts-unified-overrides.md` and tracking issue https://github.com/open-mercato/open-mercato/issues/1787.'
 
 /**
  * Walk every `ModuleEntry` and dispatch its `overrides.<domain>` shape
@@ -312,7 +312,7 @@ export function applyModuleOverridesFromEnabledModules(
 // runtime override scenarios call the dispatcher / programmatic API
 // before `bootstrap.ts` triggers manifest registration.
 //
-// Spec: `.ai/specs/2026-05-04-modules-ts-unified-overrides.md` (Phases 2/3).
+// Spec: `.ai/specs/implemented/2026-05-04-modules-ts-unified-overrides.md` (Phases 2/3).
 
 // ApiRouteManifestEntry / ApiHandler / HttpMethod live in ./registry. The
 // type-only import is erased at runtime, so there is no cycle even though

package/src/modules/search.ts

@@ -160,7 +160,7 @@ export interface SearchStrategy {
   bulkIndex?(records: IndexableRecord[]): Promise<void>
 
   /** Purge all records for an entity type (optional) */
-  purge?(entityId: EntityId, tenantId: string): Promise<void>
+  purge?(entityId: EntityId, tenantId: string, organizationId?: string | null): Promise<void>
 }
 
 // =============================================================================