@effect-app/infra 0.196.6 → 0.197.0

package/dist/services/query.js

@@ -37,7 +37,7 @@ const wh = (...operation) => (current) => new Where({ current, operation });
 export const where = wh;
 export const and = (...operation) => (current) => new And({ current, operation: typeof operation[0] === "function" ? operation[0] : operation });
 export const or = (...operation) => (current) => new Or({ current, operation: typeof operation[0] === "function" ? operation[0] : operation });
-export const order = (field, desc) => (current) => new Order({ current, field, desc });
+export const order = (field, desc) => (current) => new Order({ current, field, direction: desc ? "DESC" : "ASC" });
 export const page = ({ limit, skip }) => (current) => new Page({
     current,
     limit,
@@ -51,8 +51,10 @@ const interpret = (_) => {
     let schema = undefined;
     let limit = undefined;
     let skip = undefined;
+    const order = [];
     const upd = (v) => {
         values.push(...v.filter);
+        order.push(...v.order);
         limit = v.limit;
         skip = v.skip;
         schema = v.schema;
@@ -117,7 +119,8 @@ const interpret = (_) => {
         filter: values,
         limit,
         skip,
-        schema
+        schema,
+        order
     };
 };
 export const query = ((repo, q) => {
@@ -150,4 +153,4 @@ export const query = ((repo, q) => {
         ? repo.utils.parseMany2(_, schema)
         : repo.utils.parseMany(_))));
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/services/query.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/services/query.ts"],"names":[],"mappings":"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"}

package/dist/services/simpledb/cosmosdb.d.ts

@@ -7,8 +7,8 @@ import type { DBRecord } from "./shared.js";
 import { OptimisticLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<EA, never, REncode>, decode: (d: EA) => Effect<A, EDecode, RDecode>, indexes: IndexingPolicy) => import("effect/Effect").Effect<{
-    find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, import("effect/Cause").UnknownException | simpledb.InvalidStateError, simpledb.RecordCache | RDecode | Cosmos.CosmosClient>;
+    find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, import("effect/Cause").UnknownException | simpledb.InvalidStateError, Cosmos.CosmosClient | simpledb.RecordCache | RDecode>;
     findBy: (parameters: Record<string, string>) => import("effect/Effect").Effect<import("effect/Option").Option<any>, import("effect/Cause").UnknownException, Cosmos.CosmosClient>;
-    save: (record: A) => import("effect/Effect").Effect<A, OptimisticLockException, simpledb.RecordCache | REncode | Cosmos.CosmosClient>;
+    save: (record: A) => import("effect/Effect").Effect<A, OptimisticLockException, Cosmos.CosmosClient | simpledb.RecordCache | REncode>;
 }, import("effect/Cause").UnknownException, Cosmos.CosmosClient>;
 //# sourceMappingURL=cosmosdb.d.ts.map

package/dist/services/simpledb/diskdb.d.ts

@@ -6,7 +6,7 @@ import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<EA, never, REncode>, decode: (d: EA) => Effect<A, EDecode, RDecode>, schemaVersion: string, makeIndexKey: (r: A) => Index, dir?: string) => {
     find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, simpledb.InvalidStateError, simpledb.RecordCache | RDecode>;
     findByIndex: (index: Index) => import("effect/Effect").Effect<import("effect/Option").Option<TKey>, never, never>;
-    save: (record: A) => import("effect/Effect").Effect<A, CouldNotAquireDbLockException | simpledb.InvalidStateError | import("./shared.js").OptimisticLockException, simpledb.RecordCache | REncode>;
+    save: (record: A) => import("effect/Effect").Effect<A, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, simpledb.RecordCache | REncode>;
 };
 export declare function initialise(dir: string): void;
 //# sourceMappingURL=diskdb.d.ts.map

package/dist/services/simpledb/memdb.d.ts

@@ -6,6 +6,6 @@ import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<EA, never, REncode>, decode: (d: EA) => Effect<A, EDecode, RDecode>) => {
     find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, import("@effect/schema/ParseResult").ParseError | simpledb.InvalidStateError, simpledb.RecordCache | RDecode>;
     findBy: <V extends Partial<A>>(keys: V, eq: Equivalence<V>) => import("effect/Effect").Effect<import("effect/Option").Option<A & {}>, import("@effect/schema/ParseResult").ParseError, RDecode>;
-    save: (record: A) => import("effect/Effect").Effect<A, import("@effect/schema/ParseResult").ParseError | simpledb.InvalidStateError | import("./shared.js").OptimisticLockException, simpledb.RecordCache | REncode>;
+    save: (record: A) => import("effect/Effect").Effect<A, import("@effect/schema/ParseResult").ParseError | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, simpledb.RecordCache | REncode>;
 };
 //# sourceMappingURL=memdb.d.ts.map

package/dist/services/simpledb/redisdb.d.ts

@@ -6,22 +6,22 @@ import type { DBRecord, Index } from "./shared.js";
 import { CouldNotAquireDbLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<EA, never, REncode>, decode: (d: EA) => Effect<A, EDecode, RDecode>, schemaVersion: string, makeIndexKey: (r: A) => Index) => {
-    find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, simpledb.InvalidStateError, RDecode | RedisClient | simpledb.RecordCache>;
+    find: (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, simpledb.InvalidStateError, RedisClient | simpledb.RecordCache | RDecode>;
     findByIndex: (index: Index) => import("effect/Effect").Effect<import("effect/Option").Option<TKey>, import("@effect-app/infra-adapters/redis-client").ConnectionException, RedisClient>;
-    save: (record: A) => import("effect/Effect").Effect<A, CouldNotAquireDbLockException | simpledb.InvalidStateError | import("./shared.js").OptimisticLockException, REncode | RedisClient | simpledb.RecordCache>;
+    save: (record: A) => import("effect/Effect").Effect<A, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, RedisClient | simpledb.RecordCache | REncode>;
 };
 declare const RedisSerializedDBRecord_base: S.EnhancedClass<{
+    readonly data: string;
     readonly version: string;
     readonly timestamp: Date;
-    readonly data: string;
 }, {
+    readonly data: string;
     readonly version: string;
     readonly timestamp: string;
-    readonly data: string;
 }, never, {
+    readonly data: string;
     readonly version: string;
     readonly timestamp: Date;
-    readonly data: string;
 }, RedisSerializedDBRecord, {
     version: S.Schema<string, string, never>;
     timestamp: S.Schema<Date, string, never> & {

package/dist/services/simpledb/shared.d.ts

@@ -38,17 +38,17 @@ export interface DBRecord<TKey extends string> {
     id: TKey;
 }
 declare const SerializedDBRecord_base: S.EnhancedClass<{
+    readonly data: string;
     readonly version: string;
     readonly timestamp: Date;
-    readonly data: string;
 }, {
+    readonly data: string;
     readonly version: string;
     readonly timestamp: string;
-    readonly data: string;
 }, never, {
+    readonly data: string;
     readonly version: string;
     readonly timestamp: Date;
-    readonly data: string;
 }, SerializedDBRecord, {
     version: S.Schema<string, string, never>;
     timestamp: S.Schema<Date, string, never> & {
@@ -59,13 +59,13 @@ declare const SerializedDBRecord_base: S.EnhancedClass<{
 export declare class SerializedDBRecord extends SerializedDBRecord_base {
 }
 export declare function makeSerialisedDBRecord(s: Schema<any>): S.Schema<{
+    readonly data: any;
     readonly version: number;
     readonly timestamp: Date;
-    readonly data: any;
 }, {
+    readonly data: any;
     readonly version: number;
     readonly timestamp: string;
-    readonly data: any;
 }, never>;
 export interface CachedRecord<T> {
     version: string;

package/dist/services/simpledb/simpledb.d.ts

@@ -17,7 +17,7 @@ export interface RecordCache extends ReturnType<typeof makeLiveRecordCache> {
 }
 export declare const RecordCache: import("effect/Context").Tag<RecordCache, RecordCache>;
 export declare const LiveRecordCache: import("effect/Layer").Layer<RecordCache, never, never>;
-export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<Option<CachedRecord<EA>>, E, R>, decode: (d: EA) => Effect<A, EDecode, RDecode>, type: string): (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, E | InvalidStateError, R | RDecode | RecordCache>;
+export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<Option<CachedRecord<EA>>, E, R>, decode: (d: EA) => Effect<A, EDecode, RDecode>, type: string): (id: string) => import("effect/Effect").Effect<import("effect/Option").Option<A>, InvalidStateError | E, RecordCache | R | RDecode>;
 export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<CachedRecord<A>, E, R>, type: string): (record: A) => import("effect/Effect").Effect<A, E, RecordCache | R>;
-export declare function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(tryRead: (id: string) => Effect<Option<CachedRecord<EA>>, E, R>, save: (r: A, version: Option<Version>) => Effect<CachedRecord<A>, E, R>, lock: (id: string) => Effect<unknown, E2, R2 | Scope>, type: string): (record: A) => import("effect/Effect").Effect<A, E | E2 | InvalidStateError | OptimisticLockException, R | RecordCache | Exclude<R2, import("effect/Scope").Scope>>;
+export declare function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(tryRead: (id: string) => Effect<Option<CachedRecord<EA>>, E, R>, save: (r: A, version: Option<Version>) => Effect<CachedRecord<A>, E, R>, lock: (id: string) => Effect<unknown, E2, R2 | Scope>, type: string): (record: A) => import("effect/Effect").Effect<A, OptimisticLockException | InvalidStateError | E | E2, RecordCache | R | Exclude<R2, import("effect/Scope").Scope>>;
 //# sourceMappingURL=simpledb.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.196.6",
+  "version": "0.197.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,10 +19,10 @@
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.146.1",
-    "@effect-app/fluent-extensions": "0.139.0",
     "@effect-app/infra-adapters": "0.133.3",
-    "effect-app": "0.173.3",
-    "@effect-app/schema": "0.197.1"
+    "@effect-app/fluent-extensions": "0.139.0",
+    "@effect-app/schema": "0.197.1",
+    "effect-app": "0.173.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",

package/src/services/Store/Cosmos/query.ts

@@ -230,11 +230,10 @@ export function buildWhereCosmosQuery3(
   importedMarkerId: string,
   defaultValues: Record<string, unknown>,
   select?: NonEmptyReadonlyArray<string>,
+  order?: NonEmptyReadonlyArray<{ key: string; direction: "ASC" | "DESC" }>,
   skip?: number,
   limit?: number
 ) {
-  const lm = skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""
-
   const statement = (x: FilterR, i: number) => {
     let k = x.path.includes(".-1.")
       ? `${x.path.split(".-1.")[0]}.${x.path.split(".-1.")[1]!}`
@@ -378,7 +377,8 @@ export function buildWhereCosmosQuery3(
     }
 
     WHERE f.id != @id ${filter.length ? `AND ${print(filter)}` : ""}
-    ${lm}`,
+    ${order ? `ORDER BY ${order.map((_) => `f.${_.key} ${_.direction}`).join(", ")}` : ""}
+    ${skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""}`,
     parameters: [
       { name: "@id", value: importedMarkerId },
       ...values

package/src/services/Store/Cosmos.ts

@@ -291,6 +291,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                         importedMarkerId,
                         defaultValues,
                         f.select as NonEmptyReadonlyArray<string> | undefined,
+                        f.order as NonEmptyReadonlyArray<{ key: string; direction: "ASC" | "DESC" }> | undefined,
                         skip,
                         limit
                       )

package/src/services/Store/Memory.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { pick } from "effect-app/utils"
+import { get, pick } from "effect-app/utils"
 import type { RequestContext } from "../../RequestContext.js"
 import type { FilterArgs, FilterJoinSelect, PersistenceModelType, Store, StoreConfig } from "./service.js"
 import { StoreMaker } from "./service.js"
@@ -12,6 +12,25 @@ export function memFilter<T extends PersistenceModelType<string>, U extends keyo
     const select = (r: T[]): M[] => (f.select ? r.map((_) => pick(_, f.select!)) : r) as any
     const skip = f?.skip
     const limit = f?.limit
+    const ords = Option.fromNullable(f.order).map((_) =>
+      _.map((_) =>
+        Order.make<T>((self, that) => {
+          // TODO: inspect data types for the right comparison?
+          const selfV = get(self, _.key) ?? false
+          const thatV = get(that, _.key) ?? false
+          if (selfV === thatV) {
+            return 0
+          }
+          if (_.direction === "ASC") {
+            return selfV < thatV ? -1 : 1
+          }
+          return selfV < thatV ? 1 : -1
+        })
+      )
+    )
+    if (ords.value) {
+      c = c.sortBy(...ords.value)
+    }
     if (!skip && limit === 1) {
       return select(
         c.findFirstMap(f.filter ? codeFilter(f.filter) : (_) => Option.some(_)).map(ReadonlyArray.make).getOrElse(
@@ -47,6 +66,7 @@ function logQuery(f: FilterArgs<any, any>, defaultValues?: any) {
         undefined,
         2
       ),
+      order: JSON.stringify(f.order, undefined, 2),
       select: JSON.stringify(f.select, undefined, 2),
       defaultValues: JSON.stringify(defaultValues, undefined, 2),
       skip: f.skip,

package/src/services/Store/service.ts

@@ -63,9 +63,15 @@ export type FilterJoinSelect = {
   value: any /* value path[valueKey] of E */
 }
 
+export interface O<PM extends PersistenceModelType<unknown>> {
+  key: keyof PM
+  direction: "ASC" | "DESC"
+}
+
 export interface FilterArgs<PM extends PersistenceModelType<unknown>, U extends keyof PM = never> {
   filter?: Filter<PM> | undefined
   select?: NonEmptyReadonlyArray<U> | undefined
+  order?: NonEmptyReadonlyArray<O<PM>>
   limit?: number | undefined
   skip?: number | undefined
 }
@@ -182,7 +188,7 @@ const makeMap = Effect.sync(() => makeContextMap())
 export class ContextMap extends TagClassMakeId("effect-app/ContextMap", makeMap)<ContextMap>() {
 }
 
-export interface PersistenceModelType<Id> {
+export interface PersistenceModelType<Id> extends Record<string, any> {
   id: Id
   _etag: string | undefined
 }

package/src/services/query.ts

@@ -93,7 +93,7 @@ export class Order<TFieldValues extends FieldValues, TFieldName extends FieldPat
   extends Data.TaggedClass("order")<{
     current: Query<TFieldValues> | QueryEnd<TFieldValues>
     field: TFieldName
-    desc?: boolean | undefined
+    direction: "ASC" | "DESC"
   }>
   implements QueryEnd<TFieldValues>
 {
@@ -122,7 +122,7 @@ export const order: <TFieldValues extends FieldValues, TFieldName extends FieldP
   field: TFieldName,
   desc?: boolean
 ) => (current: Query<TFieldValues> | QueryEnd<TFieldValues>) => QueryEnd<TFieldValues> = (field, desc) => (current) =>
-  new Order({ current, field, desc })
+  new Order({ current, field, direction: desc ? "DESC" : "ASC" })
 
 export const page: <TFieldValues extends FieldValues>(
   page: { limit?: number; skip?: number }
@@ -304,9 +304,11 @@ const interpret = <TFieldValues extends FieldValues, A = TFieldValues, R = never
   let schema: S.Schema<A, TFieldValues, R> | undefined = undefined as any
   let limit: number | undefined = undefined as any
   let skip: number | undefined = undefined as any
+  const order: { field: FieldPath<TFieldValues>; direction: "ASC" | "DESC" }[] = []
 
-  const upd = (v: { schema: any; limit: any; skip: any; filter: readonly FilterResult[] }) => {
+  const upd = (v: { schema: any; limit: any; skip: any; filter: readonly FilterResult[]; order: any[] }) => {
     values.push(...v.filter)
+    order.push(...v.order)
     limit = v.limit
     skip = v.skip
     schema = v.schema
@@ -384,7 +386,8 @@ const interpret = <TFieldValues extends FieldValues, A = TFieldValues, R = never
     filter: values,
     limit,
     skip,
-    schema
+    schema,
+    order
   }
 }