@open-mercato/shared 0.9.1-develop.7474.1.51db10479d → 0.9.1-develop.7476.1.342138d35e

package/.turbo/turbo-build.log

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

package/AGENTS.md

@@ -38,7 +38,7 @@ yarn workspace @open-mercato/shared build
 | `auth/organizationScope` | When an organization-scoped API route must resolve the caller's organization — falls back to `actorOrgId` for an "all organizations" selection, but only while the effective tenant is still the actor's tenant. On `null` for an authenticated caller answer with `organizationScopeRequiredResponse()` (400, code `organization_scope_required`) — never 401 | `@open-mercato/shared/lib/auth/organizationScope` — `resolveActiveOrganizationId(auth)`, `organizationScopeRequiredResponse()` |
 | `boolean/` | When parsing boolean strings from env/query params | `@open-mercato/shared/lib/boolean` |
 | `browser/` | When persisting client UI state to `localStorage` — use the safe wrappers and the versioned-envelope helper instead of raw `localStorage` reads/writes | `@open-mercato/shared/lib/browser/safeLocalStorage`, `@open-mercato/shared/lib/browser/versionedPreference` |
-| `catalog-visibility/` | When combining buyer-facing catalog assortment grants (group-level, channel-level) into one effective visibility check — `AssortmentScope`/`EffectiveAssortmentScope` types plus the pure `matchesOne`/`matchesScope`/`unionScopes`/`intersectScopes` algebra. Imports nothing from `catalog`, `customer_groups`, `ecommerce`, or `cart` by construction; `customer_groups`'s `resolveAssortmentScope()` and `ecommerce`'s `BuyerContext.assortmentScope` composition build on top of it | `@open-mercato/shared/lib/catalog-visibility` |
+| `catalog-visibility/` | When combining buyer-facing catalog assortment grants (group-level, channel-level) into one effective visibility check — `AssortmentScope`/`EffectiveAssortmentScope` types plus the pure `matchesOne`/`matchesScope`/`unionScopes`/`intersectScopes` algebra, plus `canonicalizeEffectiveScope`/`hashEffectiveScope` (16-hex digest for cache keys; the hash uses `node:crypto`, server-only). Imports nothing from `catalog`, `customer_groups`, `ecommerce`, or `cart` by construction; `customer_groups`'s `resolveAssortmentScope()` and `ecommerce`'s `BuyerContext.assortmentScope` composition build on top of it | `@open-mercato/shared/lib/catalog-visibility` |
 | `commands/` | When implementing undo/redo command pattern | `@open-mercato/shared/lib/commands` |
 | `commands/flush` | When a command mutates entities across multiple phases (scalar + relation syncs) — wraps phases in a single atomic flush | `@open-mercato/shared/lib/commands/flush` — `withAtomicFlush(em, phases, { transaction? })` |
 | `commands/runCrudCommandWrite` | When a command writes an entity + custom fields + CRUD/index side effects in one logical operation — composes fork → atomic flush → custom-field write → side-effect queue in the only correct order. **Prefer this over composing the primitives by hand for new commands.** | `@open-mercato/shared/lib/commands/runCrudCommandWrite` — `runCrudCommandWrite({ ctx, entityId, action, scope, phases, customFields?, events?, indexer?, sideEffect })` |

package/dist/lib/catalog-visibility/canonicalizeEffectiveScope.js

@@ -0,0 +1,33 @@
+const ID_LIST_KEYS = [
+  "categoryIds",
+  "excludeCategoryIds",
+  "excludeProductIds",
+  "excludeTagIds",
+  "tagIds"
+];
+function compareStrings(left, right) {
+  if (left < right) return -1;
+  if (left > right) return 1;
+  return 0;
+}
+function sortedUnique(values) {
+  return Array.from(new Set(values)).sort(compareStrings);
+}
+function canonicalizeBranch(scope) {
+  const members = [];
+  const nested = (scope.allOf ?? []).map(canonicalizeBranch);
+  if (nested.length > 0) members.push(`"allOf":[${sortedUnique(nested).join(",")}]`);
+  for (const key of ID_LIST_KEYS) {
+    const ids = scope[key] ?? [];
+    if (ids.length > 0) members.push(`${JSON.stringify(key)}:${JSON.stringify(sortedUnique(ids))}`);
+  }
+  return `{${members.join(",")}}`;
+}
+function canonicalizeEffectiveScope(scope) {
+  if (scope === null) return "null";
+  return `[${sortedUnique(scope.map(canonicalizeBranch)).join(",")}]`;
+}
+export {
+  canonicalizeEffectiveScope
+};
+//# sourceMappingURL=canonicalizeEffectiveScope.js.map

package/dist/lib/catalog-visibility/canonicalizeEffectiveScope.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/catalog-visibility/canonicalizeEffectiveScope.ts"],
+  "sourcesContent": ["import type { AssortmentScope, EffectiveAssortmentScope } from './types'\n\nconst ID_LIST_KEYS = [\n  'categoryIds',\n  'excludeCategoryIds',\n  'excludeProductIds',\n  'excludeTagIds',\n  'tagIds',\n] as const\n\nfunction compareStrings(left: string, right: string): number {\n  if (left < right) return -1\n  if (left > right) return 1\n  return 0\n}\n\nfunction sortedUnique(values: string[]): string[] {\n  return Array.from(new Set(values)).sort(compareStrings)\n}\n\nfunction canonicalizeBranch(scope: AssortmentScope): string {\n  const members: string[] = []\n  const nested = (scope.allOf ?? []).map(canonicalizeBranch)\n  if (nested.length > 0) members.push(`\"allOf\":[${sortedUnique(nested).join(',')}]`)\n  for (const key of ID_LIST_KEYS) {\n    const ids = scope[key] ?? []\n    if (ids.length > 0) members.push(`${JSON.stringify(key)}:${JSON.stringify(sortedUnique(ids))}`)\n  }\n  return `{${members.join(',')}}`\n}\n\n/**\n * Deterministic serialization of a resolved scope. `null` (unrestricted) serializes as `null`\n * and `[]` (deny-all) as `[]`, so the two never collide. Empty and absent arrays are\n * equivalent, id lists are sorted and deduplicated, and OR-branches and `allOf` entries are\n * ordered by their own canonical form with identical ones collapsed.\n */\nexport function canonicalizeEffectiveScope(scope: EffectiveAssortmentScope): string {\n  if (scope === null) return 'null'\n  return `[${sortedUnique(scope.map(canonicalizeBranch)).join(',')}]`\n}\n"],
+  "mappings": "AAEA,MAAM,eAAe;AAAA,EACnB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEA,SAAS,eAAe,MAAc,OAAuB;AAC3D,MAAI,OAAO,MAAO,QAAO;AACzB,MAAI,OAAO,MAAO,QAAO;AACzB,SAAO;AACT;AAEA,SAAS,aAAa,QAA4B;AAChD,SAAO,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,EAAE,KAAK,cAAc;AACxD;AAEA,SAAS,mBAAmB,OAAgC;AAC1D,QAAM,UAAoB,CAAC;AAC3B,QAAM,UAAU,MAAM,SAAS,CAAC,GAAG,IAAI,kBAAkB;AACzD,MAAI,OAAO,SAAS,EAAG,SAAQ,KAAK,YAAY,aAAa,MAAM,EAAE,KAAK,GAAG,CAAC,GAAG;AACjF,aAAW,OAAO,cAAc;AAC9B,UAAM,MAAM,MAAM,GAAG,KAAK,CAAC;AAC3B,QAAI,IAAI,SAAS,EAAG,SAAQ,KAAK,GAAG,KAAK,UAAU,GAAG,CAAC,IAAI,KAAK,UAAU,aAAa,GAAG,CAAC,CAAC,EAAE;AAAA,EAChG;AACA,SAAO,IAAI,QAAQ,KAAK,GAAG,CAAC;AAC9B;AAQO,SAAS,2BAA2B,OAAyC;AAClF,MAAI,UAAU,KAAM,QAAO;AAC3B,SAAO,IAAI,aAAa,MAAM,IAAI,kBAAkB,CAAC,EAAE,KAAK,GAAG,CAAC;AAClE;",
+  "names": []
+}

package/dist/lib/catalog-visibility/hashEffectiveScope.js

@@ -0,0 +1,9 @@
+import { createHash } from "node:crypto";
+import { canonicalizeEffectiveScope } from "./canonicalizeEffectiveScope.js";
+function hashEffectiveScope(scope) {
+  return createHash("sha256").update(canonicalizeEffectiveScope(scope)).digest("hex").slice(0, 16);
+}
+export {
+  hashEffectiveScope
+};
+//# sourceMappingURL=hashEffectiveScope.js.map

package/dist/lib/catalog-visibility/hashEffectiveScope.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/catalog-visibility/hashEffectiveScope.ts"],
+  "sourcesContent": ["import { createHash } from 'node:crypto'\nimport { canonicalizeEffectiveScope } from './canonicalizeEffectiveScope'\nimport type { EffectiveAssortmentScope } from './types'\n\n/** 16-hex-character sha256 digest of the canonical scope (SPEC-029 \u00A76.1 truncation). Server-only: uses node:crypto. */\nexport function hashEffectiveScope(scope: EffectiveAssortmentScope): string {\n  return createHash('sha256').update(canonicalizeEffectiveScope(scope)).digest('hex').slice(0, 16)\n}\n"],
+  "mappings": "AAAA,SAAS,kBAAkB;AAC3B,SAAS,kCAAkC;AAIpC,SAAS,mBAAmB,OAAyC;AAC1E,SAAO,WAAW,QAAQ,EAAE,OAAO,2BAA2B,KAAK,CAAC,EAAE,OAAO,KAAK,EAAE,MAAM,GAAG,EAAE;AACjG;",
+  "names": []
+}

package/dist/lib/catalog-visibility/index.js

@@ -2,7 +2,11 @@ import { matchesOne } from "./matchesOne.js";
 import { matchesScope } from "./matchesScope.js";
 import { unionScopes } from "./unionScopes.js";
 import { intersectScopes } from "./intersectScopes.js";
+import { canonicalizeEffectiveScope } from "./canonicalizeEffectiveScope.js";
+import { hashEffectiveScope } from "./hashEffectiveScope.js";
 export {
+  canonicalizeEffectiveScope,
+  hashEffectiveScope,
   intersectScopes,
   matchesOne,
   matchesScope,

package/dist/lib/catalog-visibility/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/catalog-visibility/index.ts"],
-  "sourcesContent": ["export type { AssortmentScope, EffectiveAssortmentScope, ScopedProduct } from './types'\nexport { matchesOne } from './matchesOne'\nexport { matchesScope } from './matchesScope'\nexport { unionScopes } from './unionScopes'\nexport { intersectScopes } from './intersectScopes'\n"],
-  "mappings": "AACA,SAAS,kBAAkB;AAC3B,SAAS,oBAAoB;AAC7B,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;",
+  "sourcesContent": ["export type { AssortmentScope, EffectiveAssortmentScope, ScopedProduct } from './types'\nexport { matchesOne } from './matchesOne'\nexport { matchesScope } from './matchesScope'\nexport { unionScopes } from './unionScopes'\nexport { intersectScopes } from './intersectScopes'\nexport { canonicalizeEffectiveScope } from './canonicalizeEffectiveScope'\nexport { hashEffectiveScope } from './hashEffectiveScope'\n"],
+  "mappings": "AACA,SAAS,kBAAkB;AAC3B,SAAS,oBAAoB;AAC7B,SAAS,mBAAmB;AAC5B,SAAS,uBAAuB;AAChC,SAAS,kCAAkC;AAC3C,SAAS,0BAA0B;",
   "names": []
 }

package/dist/lib/localization/index.js

@@ -1,11 +1,19 @@
 import { applyLocalizedContent } from "./resolver.js";
-import { registerTranslatableFields, getTranslatableFields, getTranslatableFieldsRegistry } from "./translatable-fields.js";
+import {
+  registerTranslatableFields,
+  getTranslatableFields,
+  getTranslatableFieldsRegistry,
+  registerTranslatableFieldExpander,
+  getTranslatableFieldExpander
+} from "./translatable-fields.js";
 import { registerTranslationOverlayPlugin, getTranslationOverlayPlugin } from "./overlay-plugin.js";
 export {
   applyLocalizedContent,
+  getTranslatableFieldExpander,
   getTranslatableFields,
   getTranslatableFieldsRegistry,
   getTranslationOverlayPlugin,
+  registerTranslatableFieldExpander,
   registerTranslatableFields,
   registerTranslationOverlayPlugin
 };

package/dist/lib/localization/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/localization/index.ts"],
-  "sourcesContent": ["export type { TranslationRecord, LocaleCode } from './types'\nexport { applyLocalizedContent } from './resolver'\nexport { registerTranslatableFields, getTranslatableFields, getTranslatableFieldsRegistry } from './translatable-fields'\nexport { registerTranslationOverlayPlugin, getTranslationOverlayPlugin } from './overlay-plugin'\nexport type { TranslationOverlayFn, ResolveLocaleFromRequestFn } from './overlay-plugin'\n"],
-  "mappings": "AACA,SAAS,6BAA6B;AACtC,SAAS,4BAA4B,uBAAuB,qCAAqC;AACjG,SAAS,kCAAkC,mCAAmC;",
+  "sourcesContent": ["export type { TranslationRecord, LocaleCode } from './types'\nexport { applyLocalizedContent } from './resolver'\nexport {\n  registerTranslatableFields,\n  getTranslatableFields,\n  getTranslatableFieldsRegistry,\n  registerTranslatableFieldExpander,\n  getTranslatableFieldExpander,\n} from './translatable-fields'\nexport type { TranslatableFieldExpansion, TranslatableFieldExpander } from './translatable-fields'\nexport { registerTranslationOverlayPlugin, getTranslationOverlayPlugin } from './overlay-plugin'\nexport type { TranslationOverlayFn, ResolveLocaleFromRequestFn } from './overlay-plugin'\n"],
+  "mappings": "AACA,SAAS,6BAA6B;AACtC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,kCAAkC,mCAAmC;",
   "names": []
 }

package/dist/lib/localization/translatable-fields.js

@@ -14,9 +14,35 @@ function getTranslatableFields(entityType) {
 function getTranslatableFieldsRegistry() {
   return { ...getGlobal() };
 }
+const EXPANDER_GLOBAL_KEY = "__openMercatoTranslatableFieldExpanders__";
+function getExpanderGlobal() {
+  return globalThis[EXPANDER_GLOBAL_KEY] ?? {};
+}
+function registerTranslatableFieldExpander(entityType, expander) {
+  const host = globalThis;
+  host[EXPANDER_GLOBAL_KEY] = { ...getExpanderGlobal(), [entityType]: expander };
+}
+function getTranslatableFieldExpander(entityType) {
+  return getExpanderGlobal()[entityType];
+}
+const LIST_PATH_GLOBAL_KEY = "__openMercatoTranslatableEntityListPaths__";
+function getListPathGlobal() {
+  return globalThis[LIST_PATH_GLOBAL_KEY] ?? {};
+}
+function registerTranslatableEntityListPath(entityType, listPath) {
+  const host = globalThis;
+  host[LIST_PATH_GLOBAL_KEY] = { ...getListPathGlobal(), [entityType]: listPath };
+}
+function getTranslatableEntityListPath(entityType) {
+  return getListPathGlobal()[entityType];
+}
 export {
+  getTranslatableEntityListPath,
+  getTranslatableFieldExpander,
   getTranslatableFields,
   getTranslatableFieldsRegistry,
+  registerTranslatableEntityListPath,
+  registerTranslatableFieldExpander,
   registerTranslatableFields
 };
 //# sourceMappingURL=translatable-fields.js.map

package/dist/lib/localization/translatable-fields.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/localization/translatable-fields.ts"],
-  "sourcesContent": ["type TranslatableFieldsRegistry = Record<string, string[]>\n\n// Use globalThis to survive Turbopack/esbuild module duplication where the same\n// file can be loaded as multiple module instances when mixing dynamic and static imports\nconst GLOBAL_KEY = '__openMercatoTranslatableFields__'\n\nfunction getGlobal(): TranslatableFieldsRegistry {\n  return (globalThis as any)[GLOBAL_KEY] ?? {}\n}\n\nfunction setGlobal(registry: TranslatableFieldsRegistry): void {\n  (globalThis as any)[GLOBAL_KEY] = registry\n}\n\nexport function registerTranslatableFields(fields: TranslatableFieldsRegistry): void {\n  setGlobal({ ...getGlobal(), ...fields })\n}\n\nexport function getTranslatableFields(entityType: string): string[] | undefined {\n  return getGlobal()[entityType]\n}\n\nexport function getTranslatableFieldsRegistry(): TranslatableFieldsRegistry {\n  return { ...getGlobal() }\n}\n"],
-  "mappings": "AAIA,MAAM,aAAa;AAEnB,SAAS,YAAwC;AAC/C,SAAQ,WAAmB,UAAU,KAAK,CAAC;AAC7C;AAEA,SAAS,UAAU,UAA4C;AAC7D,EAAC,WAAmB,UAAU,IAAI;AACpC;AAEO,SAAS,2BAA2B,QAA0C;AACnF,YAAU,EAAE,GAAG,UAAU,GAAG,GAAG,OAAO,CAAC;AACzC;AAEO,SAAS,sBAAsB,YAA0C;AAC9E,SAAO,UAAU,EAAE,UAAU;AAC/B;AAEO,SAAS,gCAA4D;AAC1E,SAAO,EAAE,GAAG,UAAU,EAAE;AAC1B;",
+  "sourcesContent": ["type TranslatableFieldsRegistry = Record<string, string[]>\n\n// Use globalThis to survive Turbopack/esbuild module duplication where the same\n// file can be loaded as multiple module instances when mixing dynamic and static imports\nconst GLOBAL_KEY = '__openMercatoTranslatableFields__'\n\nfunction getGlobal(): TranslatableFieldsRegistry {\n  return (globalThis as any)[GLOBAL_KEY] ?? {}\n}\n\nfunction setGlobal(registry: TranslatableFieldsRegistry): void {\n  (globalThis as any)[GLOBAL_KEY] = registry\n}\n\nexport function registerTranslatableFields(fields: TranslatableFieldsRegistry): void {\n  setGlobal({ ...getGlobal(), ...fields })\n}\n\nexport function getTranslatableFields(entityType: string): string[] | undefined {\n  return getGlobal()[entityType]\n}\n\nexport function getTranslatableFieldsRegistry(): TranslatableFieldsRegistry {\n  return { ...getGlobal() }\n}\n\nexport type TranslatableFieldExpansion = {\n  key: string\n  label?: string\n  baseValue?: string\n}\n\nexport type TranslatableFieldExpander = (record: Record<string, unknown>) => TranslatableFieldExpansion[]\n\ntype TranslatableFieldExpanderRegistry = Record<string, TranslatableFieldExpander>\n\nconst EXPANDER_GLOBAL_KEY = '__openMercatoTranslatableFieldExpanders__'\n\ntype ExpanderGlobalHost = { [EXPANDER_GLOBAL_KEY]?: TranslatableFieldExpanderRegistry }\n\nfunction getExpanderGlobal(): TranslatableFieldExpanderRegistry {\n  return (globalThis as ExpanderGlobalHost)[EXPANDER_GLOBAL_KEY] ?? {}\n}\n\nexport function registerTranslatableFieldExpander(entityType: string, expander: TranslatableFieldExpander): void {\n  const host = globalThis as ExpanderGlobalHost\n  host[EXPANDER_GLOBAL_KEY] = { ...getExpanderGlobal(), [entityType]: expander }\n}\n\nexport function getTranslatableFieldExpander(entityType: string): TranslatableFieldExpander | undefined {\n  return getExpanderGlobal()[entityType]\n}\n\ntype TranslatableEntityListPathRegistry = Record<string, string>\n\nconst LIST_PATH_GLOBAL_KEY = '__openMercatoTranslatableEntityListPaths__'\n\ntype ListPathGlobalHost = { [LIST_PATH_GLOBAL_KEY]?: TranslatableEntityListPathRegistry }\n\nfunction getListPathGlobal(): TranslatableEntityListPathRegistry {\n  return (globalThis as ListPathGlobalHost)[LIST_PATH_GLOBAL_KEY] ?? {}\n}\n\nexport function registerTranslatableEntityListPath(entityType: string, listPath: string): void {\n  const host = globalThis as ListPathGlobalHost\n  host[LIST_PATH_GLOBAL_KEY] = { ...getListPathGlobal(), [entityType]: listPath }\n}\n\nexport function getTranslatableEntityListPath(entityType: string): string | undefined {\n  return getListPathGlobal()[entityType]\n}\n"],
+  "mappings": "AAIA,MAAM,aAAa;AAEnB,SAAS,YAAwC;AAC/C,SAAQ,WAAmB,UAAU,KAAK,CAAC;AAC7C;AAEA,SAAS,UAAU,UAA4C;AAC7D,EAAC,WAAmB,UAAU,IAAI;AACpC;AAEO,SAAS,2BAA2B,QAA0C;AACnF,YAAU,EAAE,GAAG,UAAU,GAAG,GAAG,OAAO,CAAC;AACzC;AAEO,SAAS,sBAAsB,YAA0C;AAC9E,SAAO,UAAU,EAAE,UAAU;AAC/B;AAEO,SAAS,gCAA4D;AAC1E,SAAO,EAAE,GAAG,UAAU,EAAE;AAC1B;AAYA,MAAM,sBAAsB;AAI5B,SAAS,oBAAuD;AAC9D,SAAQ,WAAkC,mBAAmB,KAAK,CAAC;AACrE;AAEO,SAAS,kCAAkC,YAAoB,UAA2C;AAC/G,QAAM,OAAO;AACb,OAAK,mBAAmB,IAAI,EAAE,GAAG,kBAAkB,GAAG,CAAC,UAAU,GAAG,SAAS;AAC/E;AAEO,SAAS,6BAA6B,YAA2D;AACtG,SAAO,kBAAkB,EAAE,UAAU;AACvC;AAIA,MAAM,uBAAuB;AAI7B,SAAS,oBAAwD;AAC/D,SAAQ,WAAkC,oBAAoB,KAAK,CAAC;AACtE;AAEO,SAAS,mCAAmC,YAAoB,UAAwB;AAC7F,QAAM,OAAO;AACb,OAAK,oBAAoB,IAAI,EAAE,GAAG,kBAAkB,GAAG,CAAC,UAAU,GAAG,SAAS;AAChF;AAEO,SAAS,8BAA8B,YAAwC;AACpF,SAAO,kBAAkB,EAAE,UAAU;AACvC;",
   "names": []
 }

package/dist/lib/query/engine.js

@@ -26,6 +26,13 @@ import { resolveListCountCap } from "./count-cap.js";
 import { mapWithConcurrency } from "./bounded-decrypt.js";
 import { parseNumberWithDefault } from "../number.js";
 import { createLogger } from "../logger/index.js";
+import {
+  buildArrayColumnNoOverlapPredicate,
+  buildArrayColumnOverlapPredicate,
+  buildJsonbNoOverlapPredicate,
+  buildJsonbOverlapPredicate,
+  buildScalarOverlapPredicate
+} from "./overlap.js";
 const logger = createLogger("shared").child({ component: "query" });
 const DECRYPT_CONCURRENCY = 8;
 const entityTableCache = /* @__PURE__ */ new Map();
@@ -841,7 +848,7 @@ class BasicQueryEngine {
           });
           continue;
         }
-        q = this.applyColumnOp(q, expr, f.op, f.value);
+        q = f.op === "overlap" ? q.where(buildScalarOverlapPredicate(expr, f.value)) : f.op === "noverlap" ? q.where(sql`false`) : this.applyColumnOp(q, expr, f.op, f.value);
       }
       const cfLeafApplicable = (key) => isCountProjection ? keySource.has(key) : Boolean(cfValueExprByKey[key]);
       const applicableGroupFilters = resolvedGroupFilters.map((group) => group.filter((rf) => rf.kind !== "cf" || cfLeafApplicable(rf.key))).filter((group) => group.length > 0);
@@ -861,7 +868,8 @@ class BasicQueryEngine {
                     value: rf.value
                   });
                 }
-                return this.buildColumnOpExpression(eb, cfValueExprByKey[rf.key], rf.op, rf.value);
+                if (rf.op === "noverlap") return sql`false`;
+                return rf.op === "overlap" ? buildScalarOverlapPredicate(cfValueExprByKey[rf.key], rf.value) : this.buildColumnOpExpression(eb, cfValueExprByKey[rf.key], rf.op, rf.value);
               }
               return this.buildIndexDocOpExpression(eb, {
                 entity: String(entity),
@@ -1101,6 +1109,10 @@ class BasicQueryEngine {
         return builder.where(column, "ilike", value);
       case "exists":
         return value ? builder.where(column, "is not", null) : builder.where(column, "is", null);
+      case "overlap":
+        return builder.where(buildArrayColumnOverlapPredicate(column, value));
+      case "noverlap":
+        return builder.where(buildArrayColumnNoOverlapPredicate(column, value));
       default:
         return builder;
     }
@@ -1194,6 +1206,11 @@ class BasicQueryEngine {
       case "exists":
         predicate = sql`${caseExpr} is not null`;
         break;
+      case "overlap":
+        predicate = buildScalarOverlapPredicate(caseExpr, value);
+        break;
+      case "noverlap":
+        return sql`false`;
       default:
         return eb.val(true);
     }
@@ -1224,6 +1241,10 @@ class BasicQueryEngine {
         return eb(column, "ilike", value);
       case "exists":
         return value ? eb(column, "is not", null) : eb(column, "is", null);
+      case "overlap":
+        return buildArrayColumnOverlapPredicate(column, value);
+      case "noverlap":
+        return buildArrayColumnNoOverlapPredicate(column, value);
       default:
         return eb.val(true);
     }
@@ -1372,6 +1393,12 @@ class BasicQueryEngine {
         case "exists":
           sub = opts.value ? sub.where(sql`${textExpr} is not null`) : sub.where(sql`${textExpr} is null`);
           break;
+        case "overlap":
+          sub = sub.where(buildJsonbOverlapPredicate(`${alias}.doc`, opts.field, opts.value));
+          break;
+        case "noverlap":
+          sub = sub.where(buildJsonbNoOverlapPredicate(`${alias}.doc`, opts.field, opts.value));
+          break;
         default:
           break;
       }