@relayfx/test 0.2.16 → 0.3.1

package/dist/index.js

@@ -4093,6 +4093,7 @@ var exports_execution_event_repository = {};
 __export(exports_execution_event_repository, {
   testLayer: () => testLayer12,
   sumUsage: () => sumUsage,
+  page: () => page,
   notifyAppended: () => notifyAppended,
   memoryLayer: () => memoryLayer12,
   maxSequence: () => maxSequence,
@@ -4195,7 +4196,20 @@ var ExecutionEventRow = Schema30.Struct({
   created_at: Schema30.Union([Schema30.Date, Schema30.String, Schema30.Finite])
 }).annotate({ identifier: "Relay.ExecutionEvent.Row" });
 var maxListLimit = 1000;
+var defaultPageLimit = 256;
 var listLimit = (input) => input.limit ?? maxListLimit;
+var pageLimit = (input) => Math.max(1, Math.min(maxListLimit, Math.trunc(input.limit ?? defaultPageLimit)));
+var pageResult = (events, limit, direction) => {
+  const hasMore = events.length > limit;
+  const retained = events.slice(0, limit);
+  const ordered = direction === "backward" ? retained.toReversed() : retained;
+  return {
+    events: ordered,
+    hasMore,
+    ...ordered[0] === undefined ? {} : { oldestCursor: ordered[0].cursor },
+    ...ordered.at(-1) === undefined ? {} : { newestCursor: ordered.at(-1).cursor }
+  };
+};
 var usageReportedEventType = "model.usage.reported";
 var eventUsageTokens = (event) => {
   if (event.type !== usageReportedEventType)
@@ -4487,6 +4501,42 @@ var layer12 = Layer13.effect(Service13, Effect14.gen(function* () {
     const rows = yield* selectAfterSequence(tenantId, input).pipe(Effect14.mapError(toRepositoryError8));
     return yield* decodeEvents(rows);
   });
+  const page = Effect14.fn("ExecutionEventRepository.page")(function* (input) {
+    const tenantId = yield* current();
+    const cursor = input.direction === "forward" ? input.afterCursor : input.beforeCursor;
+    const cursorRows = cursor === undefined ? [] : yield* sql`
+              SELECT ${columns}
+              FROM relay_execution_events
+              WHERE tenant_id = ${tenantId} AND execution_id = ${input.executionId}
+                AND ${sql.literal(cursorColumn)} = ${cursor}
+              LIMIT 1
+            `.pipe(Effect14.mapError(toRepositoryError8));
+    const cursorRow = cursorRows[0];
+    if (cursor !== undefined && cursorRow === undefined) {
+      return yield* ExecutionEventCursorNotFound.make({
+        execution_id: input.executionId,
+        cursor
+      });
+    }
+    const boundary = cursorRow === undefined ? undefined : toEvent(yield* decodeRow7(cursorRow)).sequence;
+    const limit = pageLimit(input);
+    const rows = input.direction === "forward" ? yield* sql`
+              SELECT ${columns}
+              FROM relay_execution_events
+              WHERE tenant_id = ${tenantId} AND execution_id = ${input.executionId}
+                ${boundary === undefined ? sql`` : sql`AND sequence > ${boundary}`}
+              ORDER BY sequence ASC
+              LIMIT ${sql.literal(String(limit + 1))}
+            `.pipe(Effect14.mapError(toRepositoryError8)) : yield* sql`
+              SELECT ${columns}
+              FROM relay_execution_events
+              WHERE tenant_id = ${tenantId} AND execution_id = ${input.executionId}
+                ${boundary === undefined ? sql`` : sql`AND sequence < ${boundary}`}
+              ORDER BY sequence DESC
+              LIMIT ${sql.literal(String(limit + 1))}
+            `.pipe(Effect14.mapError(toRepositoryError8));
+    return pageResult(yield* decodeEvents(rows), limit, input.direction);
+  });
   return Service13.of({
     signalTransport: bus.transport,
     append,
@@ -4499,7 +4549,8 @@ var layer12 = Layer13.effect(Service13, Effect14.gen(function* () {
     sumUsage,
     notifyAppended,
     appendedSignals,
-    listAfterSequence
+    listAfterSequence,
+    page
   });
 }));
 var layerWithBus = layer12.pipe(Layer13.provide(layerFromDialect));
@@ -4561,10 +4612,24 @@ var memoryLayer12 = Layer13.effect(Service13, Effect14.gen(function* () {
     listAfterSequence: Effect14.fn("ExecutionEventRepository.memory.listAfterSequence")((input) => {
       const executionEvents = events.get(input.executionId) ?? [];
       return Effect14.succeed(executionEvents.filter((event) => input.afterSequence === undefined || event.sequence > input.afterSequence).toSorted((left, right) => left.sequence - right.sequence).slice(0, input.limit));
+    }),
+    page: Effect14.fn("ExecutionEventRepository.memory.page")(function* (input) {
+      const executionEvents = (events.get(input.executionId) ?? []).toSorted((left, right) => left.sequence - right.sequence);
+      const cursor = input.direction === "forward" ? input.afterCursor : input.beforeCursor;
+      const boundary = cursor === undefined ? undefined : executionEvents.findIndex((event) => event.cursor === cursor);
+      if (cursor !== undefined && boundary !== undefined && boundary < 0) {
+        return yield* ExecutionEventCursorNotFound.make({ execution_id: input.executionId, cursor });
+      }
+      const limit = pageLimit(input);
+      const candidates = input.direction === "forward" ? executionEvents.slice(boundary === undefined ? 0 : boundary + 1, (boundary ?? -1) + limit + 2) : executionEvents.slice(0, boundary ?? executionEvents.length).toReversed().slice(0, limit + 1);
+      return pageResult(candidates, limit, input.direction);
     })
   });
 }));
-var testLayer12 = (implementation) => Layer13.succeed(Service13, Service13.of(implementation));
+var testLayer12 = (implementation) => Layer13.succeed(Service13, Service13.of({
+  ...implementation,
+  page: implementation.page ?? (() => Effect14.succeed({ events: [], hasMore: false }))
+}));
 var append = Effect14.fn("ExecutionEventRepository.append.call")(function* (input) {
   const repository = yield* Service13;
   return yield* repository.append(input);
@@ -4573,6 +4638,10 @@ var list4 = Effect14.fn("ExecutionEventRepository.list.call")(function* (input)
   const repository = yield* Service13;
   return yield* repository.list(input);
 });
+var page = Effect14.fn("ExecutionEventRepository.page.call")(function* (input) {
+  const repository = yield* Service13;
+  return yield* repository.page(input);
+});
 var findBySequenceOrCursor = Effect14.fn("ExecutionEventRepository.findBySequenceOrCursor.call")(function* (input) {
   const repository = yield* Service13;
   return yield* repository.findBySequenceOrCursor(input);
@@ -4866,10 +4935,10 @@ var layerWithoutBus = Layer14.effect(Service14, Effect15.gen(function* () {
             ${cursor === undefined ? sql`` : sql`AND (updated_at > ${timestampParam(sql, cursor.updatedAt)} OR (updated_at = ${timestampParam(sql, cursor.updatedAt)} AND id > ${cursor.id}))`}
           ORDER BY updated_at ASC, id ASC LIMIT ${sql.literal(String(pageSize))}
         `.pipe(Effect15.mapError(toRepositoryError9));
-      const page = (yield* Effect15.forEach(rows, decodeRow8)).map(toRecord6);
-      records.push(...page);
-      const last = page.at(-1);
-      if (last === undefined || page.length < pageSize)
+      const page2 = (yield* Effect15.forEach(rows, decodeRow8)).map(toRecord6);
+      records.push(...page2);
+      const last = page2.at(-1);
+      if (last === undefined || page2.length < pageSize)
         break;
       cursor = { updatedAt: last.updatedAt, id: last.id };
     }
@@ -4913,9 +4982,9 @@ var memoryLayer13 = Layer14.sync(Service14, () => {
       return yield* Effect15.sync(() => {
         const limit = listLimit2(input);
         const matched = Array.from(records.values()).filter((record2) => input.rootAddressId === undefined || record2.rootAddressId === input.rootAddressId).filter((record2) => input.sessionId === undefined || record2.sessionId === input.sessionId).filter((record2) => input.status === undefined || record2.status === input.status).toSorted(compareDesc).filter((record2) => afterCursor(record2, input.cursor));
-        const page = matched.slice(0, limit).map(cloneRecord4);
-        const nextCursor = nextCursorOf(page, matched.length, limit);
-        return nextCursor === undefined ? { records: page } : { records: page, nextCursor };
+        const page2 = matched.slice(0, limit).map(cloneRecord4);
+        const nextCursor = nextCursorOf(page2, matched.length, limit);
+        return nextCursor === undefined ? { records: page2 } : { records: page2, nextCursor };
       });
     }),
     transition: Effect15.fn("ExecutionRepository.memory.transition")(function* (input) {
@@ -7285,9 +7354,9 @@ var memoryLayer22 = Layer23.sync(Service23, () => {
     list: Effect24.fn("SessionRepository.memory.list")((input) => Effect24.sync(() => {
       const limit = listLimit3(input);
       const matched = Array.from(sessions.values()).filter((record2) => input.rootAddressId === undefined || record2.rootAddressId === input.rootAddressId).toSorted(compareDesc2).filter((record2) => afterCursor2(record2, input.cursor));
-      const page = matched.slice(0, limit).map(cloneSession);
-      const nextCursor = nextCursorOf2(page, matched.length, limit);
-      return nextCursor === undefined ? { records: page } : { records: page, nextCursor };
+      const page2 = matched.slice(0, limit).map(cloneSession);
+      const nextCursor = nextCursorOf2(page2, matched.length, limit);
+      return nextCursor === undefined ? { records: page2 } : { records: page2, nextCursor };
     })),
     touch: Effect24.fn("SessionRepository.memory.touch")(function* (input) {
       const current2 = sessions.get(input.id);
@@ -10320,7 +10389,27 @@ class EventLogError extends Schema47.TaggedErrorClass()("EventLogError", {
 class Service30 extends Context30.Service()("@relayfx/runtime/execution/event-log-service/Service") {
 }
 var defaultReplayLimit = 1000;
+var defaultPageLimit2 = 256;
 var limitOf = (input) => input.limit ?? defaultReplayLimit;
+var pageLimitOf = (input) => Math.max(1, Math.min(defaultReplayLimit, Math.trunc(input.limit ?? defaultPageLimit2)));
+var pageEvents = (events, input) => {
+  const cursor = input.direction === "forward" ? input.afterCursor : input.beforeCursor;
+  const boundary = cursor === undefined ? undefined : events.findIndex((event) => event.cursor === cursor);
+  if (cursor !== undefined && boundary !== undefined && boundary < 0) {
+    return Effect33.fail(EventLogCursorNotFound.make({ execution_id: input.executionId, cursor }));
+  }
+  const limit = pageLimitOf(input);
+  const candidates = input.direction === "forward" ? events.slice(boundary === undefined ? 0 : boundary + 1, (boundary ?? -1) + limit + 2) : events.slice(0, boundary ?? events.length).toReversed().slice(0, limit + 1);
+  const hasMore = candidates.length > limit;
+  const retained = candidates.slice(0, limit);
+  const ordered = input.direction === "backward" ? retained.toReversed() : retained;
+  return Effect33.succeed({
+    events: ordered,
+    hasMore,
+    ...ordered[0] === undefined ? {} : { oldestCursor: ordered[0].cursor },
+    ...ordered.at(-1) === undefined ? {} : { newestCursor: ordered.at(-1).cursor }
+  });
+};
 var eventUsageTokens2 = (event) => {
   if (event.type !== "model.usage.reported")
     return 0;
@@ -10468,6 +10557,7 @@ var layerFromRepository2 = Layer30.effect(Service30, Effect33.gen(function* () {
       yield* recordEventReplayed("repository", replay.history.length);
       return replay.history;
     }),
+    page: Effect33.fn("EventLog.repository.page")((input) => repository.page(input).pipe(Effect33.mapError(mapRepositoryListError))),
     stream: (input) => Stream5.unwrap(loadReplay(input).pipe(Effect33.map(({ history, sequence }) => {
       const replay = Stream5.fromIterable(history);
       return history.some(isTerminal) ? replay : replay.pipe(Stream5.concat(liveTail(repository, hubs, input, history.at(-1)?.sequence ?? sequence).pipe(Stream5.takeUntil(isTerminal))));
@@ -10523,6 +10613,10 @@ var memoryLayer28 = Layer30.effect(Service30, Effect33.gen(function* () {
       yield* recordEventReplayed("memory", replay.history.length);
       return replay.history;
     }),
+    page: Effect33.fn("EventLog.memory.page")(function* (input) {
+      const executionEvents = yield* allEvents(input.executionId);
+      return yield* pageEvents(executionEvents, input);
+    }),
     stream: (input) => Stream5.unwrap(loadReplay(input).pipe(Effect33.map(({ history, sequence }) => {
       const replay = Stream5.fromIterable(history);
       return history.some(isTerminal) ? replay : replay.pipe(Stream5.concat(liveEvents(pubsub, input, history, sequence)));
@@ -10577,6 +10671,10 @@ var replay = Effect33.fn("EventLog.replay.call")(function* (input) {
   const service = yield* Service30;
   return yield* service.replay(input);
 });
+var page2 = Effect33.fn("EventLog.page.call")(function* (input) {
+  const service = yield* Service30;
+  return yield* service.page(input);
+});
 var findBySequenceOrCursor2 = Effect33.fn("EventLog.findBySequenceOrCursor.call")(function* (input) {
   const service = yield* Service30;
   return yield* service.findBySequenceOrCursor(input);
@@ -19040,7 +19138,7 @@ var layerFromServices2 = Layer86.effect(Service66, Effect97.gen(function* () {
   return Service66.of({
     stream: (input) => Stream14.unwrap(Effect97.gen(function* () {
       const seen = yield* Ref25.make(HashSet8.empty());
-      const listAll = (cursor) => repository.list({ sessionId: input.sessionId, limit: 100, ...cursor === undefined ? {} : { cursor } }).pipe(Effect97.flatMap((page) => page.nextCursor === undefined ? Effect97.succeed(page.records) : listAll(page.nextCursor).pipe(Effect97.map((rest) => [...page.records, ...rest]))));
+      const listAll = (cursor) => repository.list({ sessionId: input.sessionId, limit: 100, ...cursor === undefined ? {} : { cursor } }).pipe(Effect97.flatMap((page3) => page3.nextCursor === undefined ? Effect97.succeed(page3.records) : listAll(page3.nextCursor).pipe(Effect97.map((rest) => [...page3.records, ...rest]))));
       const discover = listAll().pipe(Effect97.flatMap((records) => Ref25.modify(seen, (known) => {
         const fresh = records.filter((record2) => !HashSet8.has(known, record2.id));
         return [fresh, fresh.reduce((set, record2) => HashSet8.add(set, record2.id), known)];

package/dist/types/runtime/execution/event-log-service.d.ts

@@ -19,6 +19,25 @@ export interface ReplayInput {
     readonly afterCursor?: string;
     readonly limit?: number;
 }
+export type PageInput = {
+    readonly executionId: Ids.ExecutionId;
+    readonly direction: "forward";
+    readonly afterCursor?: string;
+    readonly beforeCursor?: never;
+    readonly limit?: number;
+} | {
+    readonly executionId: Ids.ExecutionId;
+    readonly direction: "backward";
+    readonly afterCursor?: never;
+    readonly beforeCursor?: string;
+    readonly limit?: number;
+};
+export interface PageResult {
+    readonly events: ReadonlyArray<Execution.ExecutionEvent>;
+    readonly hasMore: boolean;
+    readonly oldestCursor?: string;
+    readonly newestCursor?: string;
+}
 export interface FindBySequenceOrCursorInput {
     readonly executionId: Ids.ExecutionId;
     readonly sequence: Execution.ExecutionEventSequence;
@@ -41,6 +60,7 @@ export interface Interface {
     readonly append: (input: Execution.ExecutionEvent) => Effect.Effect<Execution.ExecutionEvent, EventLogError>;
     readonly replay: (input: ReplayInput) => Effect.Effect<ReadonlyArray<Execution.ExecutionEvent>, EventLogCursorNotFound | EventLogError>;
     readonly stream: (input: ReplayInput) => Stream.Stream<Execution.ExecutionEvent, EventLogCursorNotFound | EventLogError>;
+    readonly page: (input: PageInput) => Effect.Effect<PageResult, EventLogCursorNotFound | EventLogError>;
     readonly findBySequenceOrCursor: (input: FindBySequenceOrCursorInput) => Effect.Effect<Option.Option<Execution.ExecutionEvent>, EventLogError>;
     readonly findByCursor: (input: FindByCursorInput) => Effect.Effect<Option.Option<Execution.ExecutionEvent>, EventLogError>;
     readonly findBySequence: (input: FindBySequenceInput) => Effect.Effect<Option.Option<Execution.ExecutionEvent>, EventLogError>;
@@ -53,7 +73,8 @@ export declare class Service extends Service_base {
 }
 export declare const layerFromRepository: Layer.Layer<Service, never, ExecutionEventRepository.Service>;
 export declare const memoryLayer: Layer.Layer<Service, never, never>;
-export declare const testLayer: (implementation: Interface) => Layer.Layer<Service, never, never>;
+type TestImplementation = Omit<Interface, "page"> & Partial<Pick<Interface, "page">>;
+export declare const testLayer: (implementation: TestImplementation) => Layer.Layer<Service, never, never>;
 export declare const appendIdempotentTo: {
     (eventLog: Interface, input: Execution.ExecutionEvent): Effect.Effect<Execution.ExecutionEvent, EventLogError>;
     (input: Execution.ExecutionEvent): (eventLog: Interface) => Effect.Effect<Execution.ExecutionEvent, EventLogError>;
@@ -61,6 +82,7 @@ export declare const appendIdempotentTo: {
 export declare const append: (input: Execution.ExecutionEvent) => Effect.Effect<Execution.ExecutionEvent, EventLogError, Service>;
 export declare const appendIdempotent: (input: Execution.ExecutionEvent) => Effect.Effect<Execution.ExecutionEvent, EventLogError, Service>;
 export declare const replay: (input: ReplayInput) => Effect.Effect<readonly Execution.ExecutionEvent[], EventLogCursorNotFound | EventLogError, Service>;
+export declare const page: (input: PageInput) => Effect.Effect<PageResult, EventLogCursorNotFound | EventLogError, Service>;
 export declare const findBySequenceOrCursor: (input: FindBySequenceOrCursorInput) => Effect.Effect<Option.Option<Execution.ExecutionEvent>, EventLogError, Service>;
 export declare const findByCursor: (input: FindByCursorInput) => Effect.Effect<Option.Option<Execution.ExecutionEvent>, EventLogError, Service>;
 export declare const findBySequence: (input: FindBySequenceInput) => Effect.Effect<Option.Option<Execution.ExecutionEvent>, EventLogError, Service>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@relayfx/test",
-  "version": "0.2.16",
+  "version": "0.3.1",
   "description": "Experimental deterministic test kit for Relay applications",
   "type": "module",
   "exports": {
@@ -36,7 +36,7 @@
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@relayfx/sdk": "0.2.16",
+    "@relayfx/sdk": "0.3.1",
     "effect": "4.0.0-beta.93"
   },
   "peerDependencies": {