feat(query): Map hasKey/hasValue/hasKeyValue filter ops

.changeset/query-map-has-ops.md

@@ -0,0 +1,8 @@
+---
+"effect-app": minor
+"@effect-app/infra": minor
+---
+
+Query maps as JSON arrays of `[key, value]` tuples.
+
+`where("meta", "hasKey" | "hasValue" | "hasKeyValue", ...)` (and `not*` / `*-any` / `*-all` variants) filter `ReadonlyMap` fields. Memory, Disk, SQLite, Postgres, and Cosmos compile those ops against the encoded tuple array.

packages/effect-app/src/Context.ts

@@ -48,10 +48,10 @@ export function assignTag<Identifier extends object, Shape extends object = Iden
     }
     const t = Object.assign(cls, Object.getPrototypeOf(tag), fields)
     if (!creationError) {
-      const limit = Error.stackTraceLimit
-      Error.stackTraceLimit = 2
+      const limit = Reflect.get(Error, "stackTraceLimit")
+      Reflect.set(Error, "stackTraceLimit", 2)
       creationError = new Error()
-      Error.stackTraceLimit = limit
+      if (limit !== undefined) Reflect.set(Error, "stackTraceLimit", limit)
     }
     // the stack is used to get the location of the tag definition, if a service is not found in the registry
     Object.defineProperty(t, "stack", {

packages/effect-app/src/Model/filter/filterApi.ts

@@ -17,6 +17,24 @@ export type OtherOps =
   | "notIncludes-any"
   | "includes-all"
   | "notIncludes-all"
+  | "hasKey"
+  | "notHasKey"
+  | "hasValue"
+  | "notHasValue"
+  | "hasKeyValue"
+  | "notHasKeyValue"
+  | "hasKey-any"
+  | "notHasKey-any"
+  | "hasKey-all"
+  | "notHasKey-all"
+  | "hasValue-any"
+  | "notHasValue-any"
+  | "hasValue-all"
+  | "notHasValue-all"
+  | "hasKeyValue-any"
+  | "notHasKeyValue-any"
+  | "hasKeyValue-all"
+  | "notHasKeyValue-all"
   | "eq"
   | "neq"
   | "gt"

packages/effect-app/src/Model/query/dsl.ts

@@ -1161,6 +1161,10 @@ type GetArV<T> = T extends ReadonlySet<infer R> ? R
   : T extends readonly (infer R)[] ? R
   : never
 
+type GetMapK<T> = T extends ReadonlyMap<infer K, infer _V> ? K : never
+type GetMapV<T> = T extends ReadonlyMap<infer _K, infer V> ? V : never
+type GetMapEntry<T> = T extends ReadonlyMap<infer K, infer V> ? readonly [K, V] : never
+
 type InValues<T> = readonly T[] | ReadonlySet<T>
 
 export type FilterContinuations<IsCurrentInitial extends boolean = false> = {
@@ -1264,6 +1268,96 @@ export type FilterContinuations<IsCurrentInitial extends boolean = false> = {
     V extends FieldPathValue<TFieldValues, TFieldName>,
     TFieldValuesRefined extends TFieldValues = TFieldValues,
     E extends boolean = false
+  >(
+    path: TFieldName,
+    op: "hasKey" | "notHasKey",
+    value: GetMapK<V>
+  ): (
+    current: IsCurrentInitial extends true ? Query<TFieldValues>
+      : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  ) => IsCurrentInitial extends true ? QueryWhere<TFieldValues>
+    : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    E extends boolean = false
+  >(
+    path: TFieldName,
+    op: "hasValue" | "notHasValue",
+    value: GetMapV<V>
+  ): (
+    current: IsCurrentInitial extends true ? Query<TFieldValues>
+      : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  ) => IsCurrentInitial extends true ? QueryWhere<TFieldValues>
+    : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    E extends boolean = false
+  >(
+    path: TFieldName,
+    op: "hasKeyValue" | "notHasKeyValue",
+    value: GetMapEntry<V>
+  ): (
+    current: IsCurrentInitial extends true ? Query<TFieldValues>
+      : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  ) => IsCurrentInitial extends true ? QueryWhere<TFieldValues>
+    : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    E extends boolean = false
+  >(
+    path: TFieldName,
+    op: "hasKey-any" | "notHasKey-any" | "hasKey-all" | "notHasKey-all",
+    value: InValues<GetMapK<V>>
+  ): (
+    current: IsCurrentInitial extends true ? Query<TFieldValues>
+      : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  ) => IsCurrentInitial extends true ? QueryWhere<TFieldValues>
+    : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    E extends boolean = false
+  >(
+    path: TFieldName,
+    op: "hasValue-any" | "notHasValue-any" | "hasValue-all" | "notHasValue-all",
+    value: InValues<GetMapV<V>>
+  ): (
+    current: IsCurrentInitial extends true ? Query<TFieldValues>
+      : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  ) => IsCurrentInitial extends true ? QueryWhere<TFieldValues>
+    : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    E extends boolean = false
+  >(
+    path: TFieldName,
+    op: "hasKeyValue-any" | "notHasKeyValue-any" | "hasKeyValue-all" | "notHasKeyValue-all",
+    value: InValues<GetMapEntry<V>>
+  ): (
+    current: IsCurrentInitial extends true ? Query<TFieldValues>
+      : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  ) => IsCurrentInitial extends true ? QueryWhere<TFieldValues>
+    : QueryWhere<TFieldValues, TFieldValuesRefined, E>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>,
+    TFieldValuesRefined extends TFieldValues = TFieldValues,
+    E extends boolean = false
   >(f: {
     path: TFieldName
     op: "eq"
@@ -1364,6 +1458,90 @@ export type FilterContinuationsWithSubpath = {
   ): (
     current: Query<TFieldValues>
   ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    TFieldValuesSub extends TFieldValues[TFieldName][number],
+    TFieldNameSub extends FieldPath<TFieldValuesSub>,
+    V extends FieldPathValue<TFieldValuesSub, TFieldNameSub>
+  >(
+    subPath: TFieldName,
+    restPath: TFieldNameSub,
+    op: "hasKey" | "notHasKey",
+    value: GetMapK<V>
+  ): (
+    current: Query<TFieldValues>
+  ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    TFieldValuesSub extends TFieldValues[TFieldName][number],
+    TFieldNameSub extends FieldPath<TFieldValuesSub>,
+    V extends FieldPathValue<TFieldValuesSub, TFieldNameSub>
+  >(
+    subPath: TFieldName,
+    restPath: TFieldNameSub,
+    op: "hasValue" | "notHasValue",
+    value: GetMapV<V>
+  ): (
+    current: Query<TFieldValues>
+  ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    TFieldValuesSub extends TFieldValues[TFieldName][number],
+    TFieldNameSub extends FieldPath<TFieldValuesSub>,
+    V extends FieldPathValue<TFieldValuesSub, TFieldNameSub>
+  >(
+    subPath: TFieldName,
+    restPath: TFieldNameSub,
+    op: "hasKeyValue" | "notHasKeyValue",
+    value: GetMapEntry<V>
+  ): (
+    current: Query<TFieldValues>
+  ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    TFieldValuesSub extends TFieldValues[TFieldName][number],
+    TFieldNameSub extends FieldPath<TFieldValuesSub>,
+    V extends FieldPathValue<TFieldValuesSub, TFieldNameSub>
+  >(
+    subPath: TFieldName,
+    restPath: TFieldNameSub,
+    op: "hasKey-any" | "notHasKey-any" | "hasKey-all" | "notHasKey-all",
+    value: InValues<GetMapK<V>>
+  ): (
+    current: Query<TFieldValues>
+  ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    TFieldValuesSub extends TFieldValues[TFieldName][number],
+    TFieldNameSub extends FieldPath<TFieldValuesSub>,
+    V extends FieldPathValue<TFieldValuesSub, TFieldNameSub>
+  >(
+    subPath: TFieldName,
+    restPath: TFieldNameSub,
+    op: "hasValue-any" | "notHasValue-any" | "hasValue-all" | "notHasValue-all",
+    value: InValues<GetMapV<V>>
+  ): (
+    current: Query<TFieldValues>
+  ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    TFieldValuesSub extends TFieldValues[TFieldName][number],
+    TFieldNameSub extends FieldPath<TFieldValuesSub>,
+    V extends FieldPathValue<TFieldValuesSub, TFieldNameSub>
+  >(
+    subPath: TFieldName,
+    restPath: TFieldNameSub,
+    op: "hasKeyValue-any" | "notHasKeyValue-any" | "hasKeyValue-all" | "notHasKeyValue-all",
+    value: InValues<GetMapEntry<V>>
+  ): (
+    current: Query<TFieldValues>
+  ) => QueryWhere<TFieldValues>
   <
     TFieldValues extends FieldValues,
     TFieldName extends FieldPath<TFieldValues>,

packages/effect-app/src/Schema/ext.ts

@@ -119,15 +119,15 @@ const dateHelpers = (s: S.Date) => ({
    * omitted from `.make(...)` input. NOT applied during decode — cannot be
    * used to JIT-migrate database fields. See file-level note.
    */
-  withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.sync(() => new global.Date()))),
+  withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.sync(() => new globalThis.Date()))),
   /**
    * Decode-time default `new Date()`. **Discouraged for persisted data:** a
    * missing field may be data corruption, not an old-shape document; silently
    * substituting `new Date()` hides the problem. Prefer an explicit,
    * preferably versioned migration over a decode-time fallback. See
    * file-level note.
    */
-  withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.sync(() => new global.Date())))
+  withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.sync(() => new globalThis.Date())))
 })
 
 /** Like the default Schema `Date` (Encoded is `Date`) with default helpers. */

packages/infra/src/Emailer/Sendgrid.ts

@@ -53,8 +53,8 @@ const makeSendgrid = (
 
           const ret = yield* Effect
             .callback<
-              [sgMail.ClientResponse, Record<string, unknown>],
-              Error | sgMail.ResponseError
+              Awaited<ReturnType<typeof sgMail.send>>,
+              Error
             >(
               (resume) =>
                 void sgMail.send(

packages/infra/src/Store/Cosmos.ts

@@ -20,6 +20,7 @@ import { InfraLogger } from "../logger.ts"
 import { annotateCosmosResponse, annotateDb } from "../otel.ts"
 import { buildWhereCosmosQuery3, logQuery } from "./Cosmos/query.ts"
 import { makeJsonDocumentCodec } from "./jsonDocument.ts"
+import { toJsonQueryValue } from "./utils.ts"
 
 const makeMapId =
   <IdKey extends keyof Encoded, Encoded extends FieldValues>(idKey: IdKey) => ({ [idKey]: id, ...e }: Encoded) => ({
@@ -98,7 +99,8 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
       const mapId = makeMapId<IdKey, Encoded>(idKey)
       const mapReverseId = makeReverseMapId<IdKey, Encoded>(idKey)
       const codec = makeJsonDocumentCodec<Encoded>(config?.schema)
-      const fromStored = (raw: Encoded) => codec.decode({ ...config?.defaultValues, ...mapReverseId(raw as any) })
+      const defaultValues = toJsonQueryValue(config?.defaultValues ?? {}) as Partial<Encoded>
+      const fromStored = (raw: Encoded) => codec.decode({ ...defaultValues, ...mapReverseId(raw as any) })
       type PM = PersistenceModelType<Encoded>
       type PMCosmos = PersistenceModelType<Omit<Encoded, IdKey> & { id: string }>
       const containerId = `${prefix}${name}`
@@ -131,7 +133,6 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
           return namespace
         }))
 
-      const defaultValues = config?.defaultValues ?? {}
       const container = db.container(containerId)
       const bulk = container.items.bulk.bind(container.items)
       const execBatch = container.items.batch.bind(container.items)

packages/infra/src/Store/Cosmos/query.ts

@@ -105,6 +105,43 @@ export function buildWhereCosmosQuery3(
           (x.value as readonly unknown[]).map((_, i) => `${v}__${i}`).join(", ")
         }))`
 
+      case "hasKey":
+        return `EXISTS(SELECT VALUE p FROM p IN ${k} WHERE p[0] = ${v})`
+      case "notHasKey":
+        return `(NOT EXISTS(SELECT VALUE p FROM p IN ${k} WHERE p[0] = ${v}))`
+      case "hasValue":
+        return `EXISTS(SELECT VALUE p FROM p IN ${k} WHERE p[1] = ${v})`
+      case "notHasValue":
+        return `(NOT EXISTS(SELECT VALUE p FROM p IN ${k} WHERE p[1] = ${v}))`
+      case "hasKeyValue":
+        return `ARRAY_CONTAINS(${k}, ${v})`
+      case "notHasKeyValue":
+        return `(NOT ARRAY_CONTAINS(${k}, ${v}))`
+      case "hasKey-any":
+        return `EXISTS(SELECT VALUE p FROM p IN ${k} WHERE ARRAY_CONTAINS(${v}, p[0]))`
+      case "notHasKey-any":
+        return `(NOT EXISTS(SELECT VALUE p FROM p IN ${k} WHERE ARRAY_CONTAINS(${v}, p[0])))`
+      case "hasKey-all":
+        return `(NOT EXISTS(SELECT VALUE key FROM key IN ${v} WHERE NOT EXISTS(SELECT VALUE p FROM p IN ${k} WHERE p[0] = key)))`
+      case "notHasKey-all":
+        return `EXISTS(SELECT VALUE key FROM key IN ${v} WHERE NOT EXISTS(SELECT VALUE p FROM p IN ${k} WHERE p[0] = key))`
+      case "hasValue-any":
+        return `EXISTS(SELECT VALUE p FROM p IN ${k} WHERE ARRAY_CONTAINS(${v}, p[1]))`
+      case "notHasValue-any":
+        return `(NOT EXISTS(SELECT VALUE p FROM p IN ${k} WHERE ARRAY_CONTAINS(${v}, p[1])))`
+      case "hasValue-all":
+        return `(NOT EXISTS(SELECT VALUE val FROM val IN ${v} WHERE NOT EXISTS(SELECT VALUE p FROM p IN ${k} WHERE p[1] = val)))`
+      case "notHasValue-all":
+        return `EXISTS(SELECT VALUE val FROM val IN ${v} WHERE NOT EXISTS(SELECT VALUE p FROM p IN ${k} WHERE p[1] = val))`
+      case "hasKeyValue-any":
+        return `EXISTS(SELECT VALUE pair FROM pair IN ${v} WHERE ARRAY_CONTAINS(${k}, pair))`
+      case "notHasKeyValue-any":
+        return `(NOT EXISTS(SELECT VALUE pair FROM pair IN ${v} WHERE ARRAY_CONTAINS(${k}, pair)))`
+      case "hasKeyValue-all":
+        return `(NOT EXISTS(SELECT VALUE pair FROM pair IN ${v} WHERE NOT ARRAY_CONTAINS(${k}, pair)))`
+      case "notHasKeyValue-all":
+        return `EXISTS(SELECT VALUE pair FROM pair IN ${v} WHERE NOT ARRAY_CONTAINS(${k}, pair))`
+
       case "contains":
         return `CONTAINS(${k}, ${v}, true)`
 
@@ -165,6 +202,24 @@ export function buildWhereCosmosQuery3(
     "notIncludes-any": "includes-any",
     "includes-all": "notIncludes-all",
     "notIncludes-all": "includes-all",
+    hasKey: "notHasKey",
+    notHasKey: "hasKey",
+    hasValue: "notHasValue",
+    notHasValue: "hasValue",
+    hasKeyValue: "notHasKeyValue",
+    notHasKeyValue: "hasKeyValue",
+    "hasKey-any": "notHasKey-any",
+    "notHasKey-any": "hasKey-any",
+    "hasKey-all": "notHasKey-all",
+    "notHasKey-all": "hasKey-all",
+    "hasValue-any": "notHasValue-any",
+    "notHasValue-any": "hasValue-any",
+    "hasValue-all": "notHasValue-all",
+    "notHasValue-all": "hasValue-all",
+    "hasKeyValue-any": "notHasKeyValue-any",
+    "notHasKeyValue-any": "hasKeyValue-any",
+    "hasKeyValue-all": "notHasKeyValue-all",
+    "notHasKeyValue-all": "hasKeyValue-all",
     in: "notIn",
     notIn: "in"
   } satisfies Record<Ops, Ops>