@effect-app/infra 4.0.0-beta.315 → 4.0.0-beta.317

package/dist/Store/utils.js

@@ -1,7 +1,246 @@
 import crypto from "crypto";
 import * as Effect from "effect-app/Effect";
 import * as Option from "effect-app/Option";
+import * as S from "effect-app/Schema";
+import * as SchemaAST from "effect-app/SchemaAST";
 import { OptimisticConcurrencyException } from "../errors.js";
+const dateJson = S.toCodecJson(S.Date);
+const isPlainObject = (value) => {
+    if (value === null || typeof value !== "object" || Array.isArray(value))
+        return false;
+    if (value instanceof Date || value instanceof Map || value instanceof Set)
+        return false;
+    const proto = Object.getPrototypeOf(value);
+    return proto === Object.prototype || proto === null;
+};
+const unwrapAst = (ast) => SchemaAST.isSuspend(ast) ? unwrapAst(ast.thunk()) : ast;
+const unionAst = (hits) => {
+    if (hits.length === 0)
+        return undefined;
+    if (hits.length === 1)
+        return hits[0];
+    return S.Union(hits.map((hit) => S.make(hit))).ast;
+};
+const encodedObjects = (ast) => {
+    const current = unwrapAst(ast);
+    if (SchemaAST.isObjects(current))
+        return current;
+    if (SchemaAST.isDeclaration(current)) {
+        const encoded = unwrapAst(SchemaAST.toEncoded(current));
+        if (SchemaAST.isObjects(encoded))
+            return encoded;
+    }
+    return undefined;
+};
+const astAtPath = (ast, path) => {
+    if (ast === undefined)
+        return undefined;
+    if (path.length === 0)
+        return unwrapAst(ast);
+    const current = unwrapAst(ast);
+    const [head, ...tail] = path;
+    if (head === undefined)
+        return current;
+    if (SchemaAST.isUnion(current)) {
+        return unionAst(current.types.flatMap((member) => {
+            const hit = astAtPath(member, path);
+            return hit === undefined ? [] : [hit];
+        }));
+    }
+    if (head === "-1" || /^\d+$/.test(head)) {
+        if (SchemaAST.isArrays(current)) {
+            const element = current.rest[0] ?? current.elements[Number(head)] ?? current.elements[0];
+            return astAtPath(element, tail);
+        }
+        if (SchemaAST.isDeclaration(current) && current.typeParameters.length === 1) {
+            return astAtPath(current.typeParameters[0], tail);
+        }
+        return undefined;
+    }
+    const objects = encodedObjects(current);
+    if (objects !== undefined) {
+        const property = objects.propertySignatures.find((p) => p.name === head);
+        return property === undefined ? undefined : astAtPath(property.type, tail);
+    }
+    return undefined;
+};
+const elementAst = (ast) => {
+    if (ast === undefined)
+        return undefined;
+    const current = unwrapAst(ast);
+    if (SchemaAST.isUnion(current)) {
+        return unionAst(current.types.flatMap((member) => {
+            const hit = elementAst(member);
+            return hit === undefined ? [] : [hit];
+        }));
+    }
+    if (SchemaAST.isArrays(current))
+        return unwrapAst(current.rest[0] ?? current.elements[0] ?? current);
+    if (SchemaAST.isDeclaration(current) && current.typeParameters.length === 1) {
+        return unwrapAst(current.typeParameters[0]);
+    }
+    return current;
+};
+const mapKeyAst = (ast) => {
+    if (ast === undefined)
+        return undefined;
+    const current = unwrapAst(ast);
+    if (SchemaAST.isUnion(current)) {
+        return unionAst(current.types.flatMap((member) => {
+            const hit = mapKeyAst(member);
+            return hit === undefined ? [] : [hit];
+        }));
+    }
+    if (SchemaAST.isDeclaration(current) && current.typeParameters.length >= 2) {
+        return unwrapAst(current.typeParameters[0]);
+    }
+    return current;
+};
+const mapValueAst = (ast) => {
+    if (ast === undefined)
+        return undefined;
+    const current = unwrapAst(ast);
+    if (SchemaAST.isUnion(current)) {
+        return unionAst(current.types.flatMap((member) => {
+            const hit = mapValueAst(member);
+            return hit === undefined ? [] : [hit];
+        }));
+    }
+    if (SchemaAST.isDeclaration(current) && current.typeParameters.length >= 2) {
+        return unwrapAst(current.typeParameters[1]);
+    }
+    return current;
+};
+const asArray = (value) => Array.isArray(value) ? value : value instanceof Set ? [...value] : [value];
+const encodeJson = (ast, value) => {
+    if (ast === undefined)
+        return toJsonQueryValue(value);
+    const current = unwrapAst(ast);
+    if (isPlainObject(value)) {
+        const out = {};
+        for (const [key, child] of Object.entries(value)) {
+            out[key] = encodeJson(astAtPath(current, [key]), child);
+        }
+        return out;
+    }
+    if (Array.isArray(value)) {
+        const element = SchemaAST.isArrays(current) || SchemaAST.isUnion(current)
+            ? elementAst(current)
+            : current;
+        return value.map((item) => encodeJson(element, item));
+    }
+    if (value instanceof Set) {
+        return [...value].map((item) => encodeJson(elementAst(current), item));
+    }
+    if (value instanceof Map) {
+        return [...value.entries()].map(([k, v]) => [
+            encodeJson(mapKeyAst(current), k),
+            encodeJson(mapValueAst(current), v)
+        ]);
+    }
+    return Effect.runSync(S.encodeUnknownEffect(S.toCodecJson(S.make(current)))(value));
+};
+const encodeFilterValue = (fieldAst, op, value) => {
+    if (fieldAst === undefined)
+        return toJsonQueryValue(value);
+    if (op === "in" || op === "notIn") {
+        return asArray(value).map((item) => encodeJson(fieldAst, item));
+    }
+    if (op === "includes"
+        || op === "notIncludes"
+        || op === "includes-any"
+        || op === "notIncludes-any"
+        || op === "includes-all"
+        || op === "notIncludes-all") {
+        const element = elementAst(fieldAst);
+        return op === "includes" || op === "notIncludes"
+            ? encodeJson(element, value)
+            : asArray(value).map((item) => encodeJson(element, item));
+    }
+    if (op === "hasKeyValue"
+        || op === "notHasKeyValue"
+        || op === "hasKeyValue-any"
+        || op === "notHasKeyValue-any"
+        || op === "hasKeyValue-all"
+        || op === "notHasKeyValue-all") {
+        const keyAst = mapKeyAst(fieldAst);
+        const valueAst = mapValueAst(fieldAst);
+        const pair = (item) => Array.isArray(item) && item.length >= 2
+            ? [encodeJson(keyAst, item[0]), encodeJson(valueAst, item[1])]
+            : toJsonQueryValue(item);
+        return op === "hasKeyValue" || op === "notHasKeyValue" ? pair(value) : asArray(value).map(pair);
+    }
+    if (op === "hasKey"
+        || op === "notHasKey"
+        || op === "hasKey-any"
+        || op === "notHasKey-any"
+        || op === "hasKey-all"
+        || op === "notHasKey-all") {
+        const keyAst = mapKeyAst(fieldAst);
+        return op === "hasKey" || op === "notHasKey"
+            ? encodeJson(keyAst, value)
+            : asArray(value).map((item) => encodeJson(keyAst, item));
+    }
+    if (op === "hasValue"
+        || op === "notHasValue"
+        || op === "hasValue-any"
+        || op === "notHasValue-any"
+        || op === "hasValue-all"
+        || op === "notHasValue-all") {
+        const valueAst = mapValueAst(fieldAst);
+        return op === "hasValue" || op === "notHasValue"
+            ? encodeJson(valueAst, value)
+            : asArray(value).map((item) => encodeJson(valueAst, item));
+    }
+    return encodeJson(fieldAst, value);
+};
+/**
+ * Lower Date / Map / Set to JSON when no field schema is available.
+ * Prefer {@link encodeWithSchema} / {@link jsonifyFilter} with the store schema.
+ */
+export function toJsonQueryValue(value) {
+    if (value instanceof Date) {
+        return S.encodeSync(dateJson)(value);
+    }
+    if (value instanceof Map) {
+        return [...value.entries()].map(([k, v]) => [toJsonQueryValue(k), toJsonQueryValue(v)]);
+    }
+    if (value instanceof Set) {
+        return [...value].map((v) => toJsonQueryValue(v));
+    }
+    if (Array.isArray(value)) {
+        return value.map((v) => toJsonQueryValue(v));
+    }
+    if (isPlainObject(value)) {
+        const out = {};
+        for (const [k, v] of Object.entries(value)) {
+            out[k] = toJsonQueryValue(v);
+        }
+        return out;
+    }
+    if (value !== null && typeof value === "object") {
+        const toJSON = value.toJSON;
+        if (typeof toJSON === "function") {
+            return toJsonQueryValue(toJSON.call(value));
+        }
+    }
+    return value;
+}
+export function encodeWithSchema(schema, value) {
+    if (schema === undefined)
+        return toJsonQueryValue(value);
+    return encodeJson(SchemaAST.toEncoded(schema.ast), value);
+}
+export function jsonifyFilter(filter, schema) {
+    const ast = schema === undefined ? undefined : SchemaAST.toEncoded(schema.ast);
+    return filter.map((r) => r.t === "and-scope" || r.t === "or-scope" || r.t === "where-scope"
+        ? { ...r, result: jsonifyFilter(r.result, schema) }
+        : { ...r, value: encodeFilterValue(astAtPath(ast, r.path.split(".")), r.op, r.value) });
+}
+export const makeJsonLower = (config) => ({
+    toJson: (value) => encodeWithSchema(config?.schema, value),
+    jsonifyFilter: (filter) => jsonifyFilter(filter, config?.schema)
+});
 /** Traverse an object by a dot-separated path string, e.g. `"a.b.c"`. */
 export function get(obj, path) {
     return path.split(".").reduce((res, key) => (res != null ? res[key] : res), obj);
@@ -41,18 +280,18 @@ export function lowercaseIfString(val) {
     return val;
 }
 export function compare(valA, valB) {
-    return valA === valB;
+    return toJsonQueryValue(valA) === toJsonQueryValue(valB);
 }
 export function lowerThan(valA, valB) {
-    return valA < valB;
+    return toJsonQueryValue(valA) < toJsonQueryValue(valB);
 }
 export function lowerThanExclusive(valA, valB) {
-    return valA <= valB;
+    return toJsonQueryValue(valA) <= toJsonQueryValue(valB);
 }
 export function greaterThan(valA, valB) {
-    return valA > valB;
+    return toJsonQueryValue(valA) > toJsonQueryValue(valB);
 }
 export function greaterThanExclusive(valA, valB) {
-    return valA >= valB;
+    return toJsonQueryValue(valA) >= toJsonQueryValue(valB);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3RvcmUvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFBO0FBQzNCLE9BQU8sS0FBSyxNQUFNLE1BQU0sbUJBQW1CLENBQUE7QUFDM0MsT0FBTyxLQUFLLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQTtBQUUzQyxPQUFPLEVBQUUsOEJBQThCLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFN0QseUVBQXlFO0FBQ3pFLE1BQU0sVUFBVSxHQUFHLENBQUMsR0FBUSxFQUFFLElBQVk7SUFDeEMsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQVEsRUFBRSxHQUFXLEVBQUUsRUFBRSxDQUFDLENBQUMsR0FBRyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsRUFBRSxHQUFHLENBQUMsQ0FBQTtBQUMvRixDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLENBQ3RCLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxFQUFLLEVBQ2YsRUFBRSxDQUNMLENBQUM7SUFDQyxHQUFHLENBQUM7SUFDSix5R0FBeUc7SUFDekcsS0FBSyxFQUFFLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO0NBQzNFLENBQVEsQ0FBQTtBQUVYLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQzdDLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQ3pCLENBQUksRUFDSixLQUFZLEVBQ1osT0FBeUI7SUFFekIsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDWixJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUMzQixPQUFPLEtBQUssQ0FBQyxDQUFDLElBQUksOEJBQThCLENBQUM7Z0JBQy9DLElBQUk7Z0JBQ0osRUFBRSxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQVc7Z0JBQ3RCLE9BQU8sRUFBRSxFQUFFO2dCQUNYLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSztnQkFDZCxJQUFJLEVBQUUsR0FBRzthQUNWLENBQUMsQ0FBQTtRQUNKLENBQUM7SUFDSCxDQUFDO0lBQ0QsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM5RCxPQUFPLEtBQUssQ0FBQyxDQUFDLElBQUksOEJBQThCLENBQUM7WUFDL0MsSUFBSTtZQUNKLEVBQUUsRUFBRSxPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBVztZQUNsQyxPQUFPLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLO1lBQzVCLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSztZQUNkLElBQUksRUFBRSxHQUFHO1NBQ1YsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUNELE9BQU8sUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ3BCLENBQUMsQ0FBQyxDQUFBO0FBRUosTUFBTSxVQUFVLGlCQUFpQixDQUFJLEdBQU07SUFDekMsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUM1QixPQUFPLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtJQUMxQixDQUFDO0lBQ0QsT0FBTyxHQUFHLENBQUE7QUFDWixDQUFDO0FBRUQsTUFBTSxVQUFVLE9BQU8sQ0FBQyxJQUFhLEVBQUUsSUFBYTtJQUNsRCxPQUFPLElBQUksS0FBSyxJQUFJLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxTQUFTLENBQUMsSUFBc0IsRUFBRSxJQUFzQjtJQUN0RSxPQUFPLElBQUksR0FBRyxJQUFJLENBQUE7QUFDcEIsQ0FBQztBQUVELE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxJQUFzQixFQUFFLElBQXNCO0lBQy9FLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQTtBQUNyQixDQUFDO0FBRUQsTUFBTSxVQUFVLFdBQVcsQ0FBQyxJQUFzQixFQUFFLElBQXNCO0lBQ3hFLE9BQU8sSUFBSSxHQUFHLElBQUksQ0FBQTtBQUNwQixDQUFDO0FBRUQsTUFBTSxVQUFVLG9CQUFvQixDQUFDLElBQXNCLEVBQUUsSUFBc0I7SUFDakYsT0FBTyxJQUFJLElBQUksSUFBSSxDQUFBO0FBQ3JCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/Store/utils.ts"],"names":[],"mappings":"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"}

package/dist/logger.d.ts

@@ -1,9 +1,9 @@
 export declare const InfraLogger: {
-    logWarning: (...message: readonly any[]) => import("effect/Effect").Effect<void, never, never>;
-    logError: (...message: readonly any[]) => import("effect/Effect").Effect<void, never, never>;
-    logFatal: (...message: readonly any[]) => import("effect/Effect").Effect<void, never, never>;
-    logInfo: (...message: readonly any[]) => import("effect/Effect").Effect<void, never, never>;
+    logWarning: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
+    logError: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
+    logFatal: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
+    logInfo: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
     logDebug: (...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
-    logWithLevel: (level: import("effect/LogLevel").Severity, ...message: readonly any[]) => import("effect/Effect").Effect<void, never, never>;
+    logWithLevel: (level: import("effect/LogLevel").Severity, ...message: ReadonlyArray<any>) => import("effect/Effect").Effect<void, never, never>;
 };
 //# sourceMappingURL=logger.d.ts.map

package/examples/query.ts

@@ -76,7 +76,7 @@ const program = Effect.gen(function*() {
     and("_tag", "Something"),
     or(
       where("displayName", "Riley"),
-      and("n", "gt", "2021-01-01T00:00:00Z"), // TODO: work with To type translation, so Date?
+      and("n", "gt", new Date("2021-01-01T00:00:00Z")),
       and("_tag", "Something")
     ),
     order("displayName"),
@@ -90,7 +90,7 @@ const program = Effect.gen(function*() {
     and("_tag", "Something"),
     or(
       where("displayName", "Riley"),
-      and("n", "gt", "2021-01-01T00:00:00Z"), // TODO: work with To type translation, so Date?
+      and("n", "gt", new Date("2021-01-01T00:00:00Z")),
       and("_tag", "Something")
     ),
     order("displayName"),
@@ -112,7 +112,7 @@ expectTypeOf(test1).toEqualTypeOf<
     readonly _tag: "Something"
     readonly id: string
     readonly displayName: string
-    readonly n: string
+    readonly n: Date
     readonly union: {
       readonly _tag: "string"
       readonly value: string
@@ -129,7 +129,7 @@ expectTypeOf(testneq1).toEqualTypeOf<
     readonly _tag: "Something"
     readonly id: string
     readonly displayName: string
-    readonly n: string
+    readonly n: Date
     readonly union: {
       readonly _tag: "number"
       readonly value: number

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.315",
+  "version": "4.0.0-beta.317",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -10,18 +10,18 @@
   },
   "dependencies": {
     "@faker-js/faker": "^8.4.1",
+    "@sentry/node": "10.55.0",
     "fast-check": "^4.9.0",
     "jose": "^6.2.3",
     "proper-lockfile": "^4.1.2",
     "pure-rand": "8.4.0",
     "query-string": "^9.4.0",
-    "effect-app": "4.0.0-beta.315"
+    "effect-app": "4.0.0-beta.317"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.3",
     "@azure/service-bus": "^7.9.5",
     "@effect/sql-sqlite-node": "4.0.0-beta.107",
-    "@sentry/node": "10.55.0",
     "@sentry/opentelemetry": "10.55.0",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "25.9.1",

package/src/Store/Cosmos/query.ts

@@ -9,6 +9,7 @@ import type { SupportedValues } from "effect-app/Store"
 import { assertUnreachable } from "effect-app/utils"
 import { InfraLogger } from "../../logger.ts"
 import { isRelationCheck } from "../codeFilter.ts"
+import { jsonifyFilter, type JsonLower, toJsonQueryValue } from "../utils.ts"
 
 export function logQuery(q: {
   query: string
@@ -60,8 +61,12 @@ export function buildWhereCosmosQuery3(
   >,
   order?: NonEmptyReadonlyArray<{ key: string; direction: "ASC" | "DESC" }>,
   skip?: number,
-  limit?: number
+  limit?: number,
+  json?: JsonLower
 ) {
+  const toJson = json?.toJson ?? toJsonQueryValue
+  filter = (json?.jsonifyFilter ?? jsonifyFilter)(filter)
+  defaultValues = toJson(defaultValues) as Record<string, unknown>
   const statement = (x: FilterR, i: number) => {
     if (x.path === idKey) {
       x = { ...x, path: "id" }
@@ -89,23 +94,56 @@ export function buildWhereCosmosQuery3(
         return `(NOT ARRAY_CONTAINS(${k}, ${v}))`
 
       case "includes-any":
-        return `ARRAY_CONTAINS_ANY(${k}, ${
-          (x.value as unknown as readonly unknown[]).map((_, i) => `${v}__${i}`).join(", ")
-        })`
+        return `ARRAY_CONTAINS_ANY(${k}, ${(x.value as readonly unknown[]).map((_, i) => `${v}__${i}`).join(", ")})`
       case "notIncludes-any":
         return `(NOT ARRAY_CONTAINS_ANY(${k}, ${
-          (x.value as unknown as readonly unknown[]).map((_, i) => `${v}__${i}`).join(", ")
+          (x.value as readonly unknown[]).map((_, i) => `${v}__${i}`).join(", ")
         }))`
 
       case "includes-all":
-        return `ARRAY_CONTAINS_ALL(${k}, ${
-          (x.value as unknown as readonly unknown[]).map((_, i) => `${v}__${i}`).join(", ")
-        })`
+        return `ARRAY_CONTAINS_ALL(${k}, ${(x.value as readonly unknown[]).map((_, i) => `${v}__${i}`).join(", ")})`
       case "notIncludes-all":
         return `(NOT ARRAY_CONTAINS_ALL(${k}, ${
-          (x.value as unknown as readonly unknown[]).map((_, i) => `${v}__${i}`).join(", ")
+          (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)`
 
@@ -166,6 +204,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>

package/src/Store/Cosmos.ts

@@ -19,6 +19,8 @@ import { DatabaseError, OptimisticConcurrencyException } from "../errors.ts"
 import { InfraLogger } from "../logger.ts"
 import { annotateCosmosResponse, annotateDb } from "../otel.ts"
 import { buildWhereCosmosQuery3, logQuery } from "./Cosmos/query.ts"
+import { makeJsonDocumentCodec } from "./jsonDocument.ts"
+import { makeJsonLower } from "./utils.ts"
 
 const makeMapId =
   <IdKey extends keyof Encoded, Encoded extends FieldValues>(idKey: IdKey) => ({ [idKey]: id, ...e }: Encoded) => ({
@@ -96,6 +98,10 @@ 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 json = makeJsonLower(config)
+      const defaultValues = json.toJson(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}`
@@ -128,7 +134,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)
@@ -205,7 +210,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                         dropUndefinedT({
                           operationType: "Create" as const,
                           resourceBody: {
-                            ...Struct.omit(x, ["_etag", idKey]),
+                            ...Struct.omit(codec.encode(x), ["_etag", idKey]),
                             id: x[idKey],
                             _partitionKey: nsPartitionValue(ns, x)
                           }
@@ -217,7 +222,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                           operationType: "Replace" as const,
                           id: x[idKey],
                           resourceBody: {
-                            ...Struct.omit(x, ["_etag", idKey]),
+                            ...Struct.omit(codec.encode(x), ["_etag", idKey]),
                             id: x[idKey],
                             _partitionKey: nsPartitionValue(ns, x)
                           },
@@ -314,7 +319,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                         onNone: () => ({
                           operationType: "Create" as const,
                           resourceBody: {
-                            ...Struct.omit(x, ["_etag", idKey]),
+                            ...Struct.omit(codec.encode(x), ["_etag", idKey]),
                             id: x[idKey],
                             _partitionKey: nsPartitionValue(ns, x)
                           }
@@ -325,7 +330,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                           operationType: "Replace" as const,
                           id: x[idKey],
                           resourceBody: {
-                            ...Struct.omit(x, ["_etag", idKey]),
+                            ...Struct.omit(codec.encode(x), ["_etag", idKey]),
                             id: x[idKey],
                             _partitionKey: nsPartitionValue(ns, x)
                           },
@@ -447,7 +452,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                     container.items.query<PMCosmos>(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll()
                   )
                   yield* annotateFeed(response)
-                  return response.resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))
+                  return response.resources.map((_) => fromStored(_ as unknown as Encoded))
                 })
                 .pipe(
                   annotateDb({
@@ -492,7 +497,8 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                     | undefined,
                   f.order as NonEmptyReadonlyArray<{ key: string; direction: "ASC" | "DESC" }> | undefined,
                   skip,
-                  limit
+                  limit,
+                  json
                 )
               ),
               ns: resolveNamespace
@@ -520,7 +526,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                         container.items.query<{ f: M }>(q, { partitionKey: nsBasePartitionKey(ns) }).fetchAll()
                       )
                       yield* annotateFeed(response)
-                      return response.resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f as any) }) as any)
+                      return response.resources.map(({ f }) => fromStored(f as Encoded) as any)
                     })
                     .pipe(
                       annotateDb({
@@ -546,7 +552,7 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                 )
                 yield* annotateItem(response)
                 return Option.fromNullishOr(response.resource).pipe(
-                  Option.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))
+                  Option.map((_) => fromStored(_))
                 )
               })
               .pipe(annotateDb({
@@ -573,12 +579,12 @@ const makeCosmosStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
                   {
                     onNone: () =>
                       container.items.create({
-                        ...mapId(e),
+                        ...mapId(codec.encode(e)),
                         _partitionKey: nsPartitionValue(ns, e)
                       }),
                     onSome: (eTag) =>
                       container.item(e[idKey], nsPartitionValue(ns, e)).replace(
-                        { ...mapId(e), _partitionKey: nsPartitionValue(ns, e) },
+                        { ...mapId(codec.encode(e)), _partitionKey: nsPartitionValue(ns, e) },
                         {
                           accessCondition: {
                             type: "IfMatch",