@qlever-llc/trellis 0.10.22 → 0.11.0-rc.1

package/src/sdk/_generated/health/api.ts

@@ -3,6 +3,25 @@ import { OWNED_API } from "./owned_api.js";
 
 export { OWNED_API };
 
+type __TrellisGeneratedOptionalOperationProgress<TDesc> = TDesc extends
+  { progress: infer TProgress } ? { progress?: TProgress }
+  : { progress?: undefined };
+type __TrellisGeneratedOptionalOperationOutput<TDesc> = TDesc extends
+  { output: infer TOutput } ? { output?: TOutput }
+  : { output?: undefined };
+type __TrellisGeneratedOptionalOperationIO<TDesc> = TDesc extends
+  { input: infer TInput } ?
+    & Omit<TDesc, "input" | "progress" | "output">
+    & {
+      input: TInput;
+    }
+    & __TrellisGeneratedOptionalOperationProgress<TDesc>
+    & __TrellisGeneratedOptionalOperationOutput<TDesc>
+  : TDesc;
+type __TrellisGeneratedOperationApi<TApi> = {
+  readonly [K in keyof TApi]: __TrellisGeneratedOptionalOperationIO<TApi[K]>;
+};
+
 export type UsedApi = {
   rpc: {};
   operations: {};
@@ -19,7 +38,9 @@ export const USED_API: UsedApi = {
   subjects: {},
 };
 
-export type OwnedApi = typeof OWNED_API;
+export type OwnedApi = Omit<typeof OWNED_API, "operations"> & {
+  operations: __TrellisGeneratedOperationApi<typeof OWNED_API["operations"]>;
+};
 export type Api = {
   rpc: OwnedApi["rpc"] & UsedApi["rpc"];
   operations: OwnedApi["operations"] & UsedApi["operations"];
@@ -28,9 +49,12 @@ export type Api = {
   subjects: OwnedApi["subjects"] & UsedApi["subjects"];
 };
 
-export const API = {
+export type ApiViews = {
+  owned: OwnedApi;
+  used: UsedApi;
+};
+
+export const API: ApiViews = {
   owned: OWNED_API,
   used: USED_API,
-} as const;
-
-export type ApiViews = typeof API;
+};

package/src/sdk/_generated/health/client.ts

@@ -15,13 +15,11 @@ import type {
   OperationRef,
   OperationRefData,
   OperationRuntimeHandle,
-  OperationTransferHandle,
   PreparedTrellisEvent,
   ReceiveTransferGrant,
   ReceiveTransferHandle,
   RequestOpts,
   Result,
-  RpcHandlerContext,
   SendTransferGrant,
   SendTransferHandle,
   TerminalOperation,
@@ -34,8 +32,6 @@ import type {
 import type { API, Api } from "./api.js";
 import type * as Types from "./types.js";
 
-type WithDeps<TDeps> = [TDeps] extends [undefined] ? {} : { deps: TDeps };
-
 type EventCallback<TMessage> = {
   bivarianceHack(
     message: TMessage,
@@ -43,46 +39,10 @@ type EventCallback<TMessage> = {
   ): MaybeAsync<void, BaseError>;
 }["bivarianceHack"];
 
-type ServiceEventHandler<TEvent, TDeps = undefined> = (
-  args:
-    & { event: TEvent; context: EventListenerContext; client: HandlerClient }
-    & WithDeps<TDeps>,
+type DependencyServiceEventHandler<TEvent> = (
+  args: { event: TEvent; context: EventListenerContext; client: HandlerClient },
 ) => MaybeAsync<void, BaseError>;
 
-type RpcHandler<TInput, TOutput, TDeps = undefined> = (
-  args:
-    & { input: TInput; context: RpcHandlerContext; client: HandlerClient }
-    & WithDeps<TDeps>,
-) => MaybeAsync<TOutput, BaseError>;
-
-type FeedHandler<TInput, TEvent, TDeps = undefined> = (
-  context: {
-    input: TInput;
-    caller: unknown;
-    signal: AbortSignal;
-    emit(event: TEvent): AsyncResult<void, ValidationError | UnexpectedError>;
-    client: HandlerClient;
-  } & WithDeps<TDeps>,
-) => unknown | Promise<unknown>;
-
-type OperationHandler<
-  TInput,
-  TProgress,
-  TOutput,
-  TTransfer,
-  TDeps = undefined,
-> = (
-  context:
-    & {
-      input: TInput;
-      op: OperationRuntimeHandle<TProgress, TOutput>;
-      caller: unknown;
-      client: HandlerClient;
-    }
-    & TTransfer
-    & WithDeps<TDeps>,
-) => unknown | Promise<unknown>;
-
 export type TrellisHealthState = {};
 
 export interface TrellisHealthClient {
@@ -99,12 +59,12 @@ export interface TrellisHealthClient {
     readonly health: {
       heartbeat: {
         publish(
-          event: Omit<Types.HealthHeartbeatEvent, "header">,
+          event: Types.HealthHeartbeatEvent,
         ): AsyncResult<void, ValidationError | UnexpectedError>;
         prepare(
-          event: Omit<Types.HealthHeartbeatEvent, "header">,
+          event: Types.HealthHeartbeatEvent,
         ): Result<
-          PreparedTrellisEvent<Omit<Types.HealthHeartbeatEvent, "header">>,
+          PreparedTrellisEvent<Types.HealthHeartbeatEvent>,
           ValidationError | UnexpectedError
         >;
         listen(
@@ -122,29 +82,22 @@ export interface TrellisHealthClient {
 
 export interface Service extends TrellisHealthClient {
   readonly handle: ServiceHandle;
-  with<TDeps>(deps: TDeps): ServiceWithDeps<TDeps>;
 }
 
-export type ServiceWithDeps<TDeps> = Omit<TrellisHealthClient, "event"> & {
-  readonly event: ServiceEventSurface<TDeps>;
-  readonly handle: ServiceHandle<TDeps>;
-  with<TNextDeps>(deps: TNextDeps): ServiceWithDeps<TNextDeps>;
-};
-
-export interface ServiceEventSurface<TDeps> {
+export interface ServiceEventSurface {
   readonly health: {
     heartbeat: {
       publish(
-        event: Omit<Types.HealthHeartbeatEvent, "header">,
+        event: Types.HealthHeartbeatEvent,
       ): AsyncResult<void, ValidationError | UnexpectedError>;
       prepare(
-        event: Omit<Types.HealthHeartbeatEvent, "header">,
+        event: Types.HealthHeartbeatEvent,
       ): Result<
-        PreparedTrellisEvent<Omit<Types.HealthHeartbeatEvent, "header">>,
+        PreparedTrellisEvent<Types.HealthHeartbeatEvent>,
         ValidationError | UnexpectedError
       >;
       listen(
-        handler: ServiceEventHandler<Types.HealthHeartbeatEvent, TDeps>,
+        handler: Types.HealthHeartbeatEventHandler,
         subjectData?: Record<string, unknown>,
         opts?: EventOpts,
       ): AsyncResult<void, ValidationError | UnexpectedError>;
@@ -152,7 +105,7 @@ export interface ServiceEventSurface<TDeps> {
   };
 }
 
-export interface ServiceHandle<TDeps = undefined> {
+export interface ServiceHandle {
   readonly rpc: {};
   readonly feed: {};
   readonly operation: {};

package/src/sdk/_generated/health/contract.ts

@@ -13,7 +13,7 @@ const CONTRACT_MODULE_METADATA = Symbol.for(
 
 export const CONTRACT_ID = "trellis.health@v1" as const;
 export const CONTRACT_DIGEST =
-  "RHDzeH2V6Nltzk6WklCLbTIK48hF0hNuO9Qk6-BosT4" as const;
+  "z9RdJVXAI4q-hSkpvUX_xMYEJaKslMsayevlW4UlSeQ" as const;
 export const CONTRACT = {
   "description":
     "Expose shared Trellis heartbeat events for service observability.",
@@ -61,14 +61,6 @@ export const CONTRACT = {
           },
           "type": "array",
         },
-        "header": {
-          "properties": {
-            "id": { "type": "string" },
-            "time": { "format": "date-time", "type": "string" },
-          },
-          "required": ["id", "time"],
-          "type": "object",
-        },
         "service": {
           "properties": {
             "contractDigest": { "type": "string" },
@@ -115,7 +107,7 @@ export const CONTRACT = {
         },
         "summary": { "type": "string" },
       },
-      "required": ["header", "service", "status", "checks"],
+      "required": ["service", "status", "checks"],
       "type": "object",
     },
   },

package/src/sdk/_generated/health/mod.ts

@@ -8,7 +8,6 @@ export type {
   Service,
   ServiceEventSurface,
   ServiceHandle,
-  ServiceWithDeps,
   TrellisHealthClient,
   TrellisHealthState,
 } from "./client.js";

package/src/sdk/_generated/health/owned_api.ts

@@ -11,8 +11,8 @@ export const OWNED_API = {
     "Health.Heartbeat": {
       subject: "events.v1.Health.Heartbeat",
       event: schema<Types.HealthHeartbeatEvent>(HealthHeartbeatSchema),
-      publishCapabilities: [],
-      subscribeCapabilities: [],
+      publishCapabilities: [] as const,
+      subscribeCapabilities: [] as const,
     },
   },
   feeds: {},

package/src/sdk/_generated/health/schemas.ts

@@ -21,14 +21,6 @@ export const HealthHeartbeatSchema = {
       },
       "type": "array",
     },
-    "header": {
-      "properties": {
-        "id": { "type": "string" },
-        "time": { "format": "date-time", "type": "string" },
-      },
-      "required": ["id", "time"],
-      "type": "object",
-    },
     "service": {
       "properties": {
         "contractDigest": { "type": "string" },
@@ -75,6 +67,6 @@ export const HealthHeartbeatSchema = {
     },
     "summary": { "type": "string" },
   },
-  "required": ["header", "service", "status", "checks"],
+  "required": ["service", "status", "checks"],
   "type": "object",
 } as const;

package/src/sdk/_generated/health/types.ts

@@ -1,7 +1,19 @@
 // Generated from ./generated/contracts/manifests/trellis.health@v1.json
+import type {
+  BaseError,
+  EventListenerContext,
+  HandlerTrellis,
+  MaybeAsync,
+  TrellisEventMessage,
+} from "../../../index.js";
+
+import type { Api } from "./api.js";
+
+export type HandlerClient = HandlerTrellis<Api>;
+
 export const CONTRACT_ID = "trellis.health@v1" as const;
 export const CONTRACT_DIGEST =
-  "RHDzeH2V6Nltzk6WklCLbTIK48hF0hNuO9Qk6-BosT4" as const;
+  "z9RdJVXAI4q-hSkpvUX_xMYEJaKslMsayevlW4UlSeQ" as const;
 
 export type HealthHeartbeatEvent = {
   checks: Array<
@@ -14,7 +26,6 @@ export type HealthHeartbeatEvent = {
       summary?: string;
     }
   >;
-  header: { id: string; time: string };
   service: {
     contractDigest: string;
     contractId: string;
@@ -31,6 +42,16 @@ export type HealthHeartbeatEvent = {
   status: "healthy" | "unhealthy" | "degraded";
   summary?: string;
 };
+export type HealthHeartbeatEventMessage = TrellisEventMessage<
+  HealthHeartbeatEvent
+>;
+export type HealthHeartbeatEventHandler = (
+  args: {
+    event: HealthHeartbeatEvent;
+    context: EventListenerContext;
+    client: HandlerClient;
+  },
+) => MaybeAsync<void, BaseError>;
 
 export interface RpcMap {
 }

package/src/sdk/_generated/jobs/api.ts

@@ -6,6 +6,25 @@ import { OWNED_API as HealthApi } from "../health/mod.js";
 
 export { OWNED_API };
 
+type __TrellisGeneratedOptionalOperationProgress<TDesc> = TDesc extends
+  { progress: infer TProgress } ? { progress?: TProgress }
+  : { progress?: undefined };
+type __TrellisGeneratedOptionalOperationOutput<TDesc> = TDesc extends
+  { output: infer TOutput } ? { output?: TOutput }
+  : { output?: undefined };
+type __TrellisGeneratedOptionalOperationIO<TDesc> = TDesc extends
+  { input: infer TInput } ?
+    & Omit<TDesc, "input" | "progress" | "output">
+    & {
+      input: TInput;
+    }
+    & __TrellisGeneratedOptionalOperationProgress<TDesc>
+    & __TrellisGeneratedOptionalOperationOutput<TDesc>
+  : TDesc;
+type __TrellisGeneratedOperationApi<TApi> = {
+  readonly [K in keyof TApi]: __TrellisGeneratedOptionalOperationIO<TApi[K]>;
+};
+
 export type UsedApi = {
   rpc: {
     readonly "Auth.Requests.Validate":
@@ -43,7 +62,9 @@ export const USED_API: UsedApi = {
   subjects: {},
 };
 
-export type OwnedApi = typeof OWNED_API;
+export type OwnedApi = Omit<typeof OWNED_API, "operations"> & {
+  operations: __TrellisGeneratedOperationApi<typeof OWNED_API["operations"]>;
+};
 export type Api = {
   rpc: OwnedApi["rpc"] & UsedApi["rpc"];
   operations: OwnedApi["operations"] & UsedApi["operations"];
@@ -52,9 +73,12 @@ export type Api = {
   subjects: OwnedApi["subjects"] & UsedApi["subjects"];
 };
 
-export const API = {
+export type ApiViews = {
+  owned: OwnedApi;
+  used: UsedApi;
+};
+
+export const API: ApiViews = {
   owned: OWNED_API,
   used: USED_API,
-} as const;
-
-export type ApiViews = typeof API;
+};

package/src/sdk/_generated/jobs/client.ts

@@ -15,13 +15,11 @@ import type {
   OperationRef,
   OperationRefData,
   OperationRuntimeHandle,
-  OperationTransferHandle,
   PreparedTrellisEvent,
   ReceiveTransferGrant,
   ReceiveTransferHandle,
   RequestOpts,
   Result,
-  RpcHandlerContext,
   SendTransferGrant,
   SendTransferHandle,
   TerminalOperation,
@@ -37,8 +35,6 @@ import type * as AuthSdk from "../auth/mod.js";
 import type * as CoreSdk from "../core/mod.js";
 import type * as HealthSdk from "../health/mod.js";
 
-type WithDeps<TDeps> = [TDeps] extends [undefined] ? {} : { deps: TDeps };
-
 type EventCallback<TMessage> = {
   bivarianceHack(
     message: TMessage,
@@ -46,46 +42,10 @@ type EventCallback<TMessage> = {
   ): MaybeAsync<void, BaseError>;
 }["bivarianceHack"];
 
-type ServiceEventHandler<TEvent, TDeps = undefined> = (
-  args:
-    & { event: TEvent; context: EventListenerContext; client: HandlerClient }
-    & WithDeps<TDeps>,
+type DependencyServiceEventHandler<TEvent> = (
+  args: { event: TEvent; context: EventListenerContext; client: HandlerClient },
 ) => MaybeAsync<void, BaseError>;
 
-type RpcHandler<TInput, TOutput, TDeps = undefined> = (
-  args:
-    & { input: TInput; context: RpcHandlerContext; client: HandlerClient }
-    & WithDeps<TDeps>,
-) => MaybeAsync<TOutput, BaseError>;
-
-type FeedHandler<TInput, TEvent, TDeps = undefined> = (
-  context: {
-    input: TInput;
-    caller: unknown;
-    signal: AbortSignal;
-    emit(event: TEvent): AsyncResult<void, ValidationError | UnexpectedError>;
-    client: HandlerClient;
-  } & WithDeps<TDeps>,
-) => unknown | Promise<unknown>;
-
-type OperationHandler<
-  TInput,
-  TProgress,
-  TOutput,
-  TTransfer,
-  TDeps = undefined,
-> = (
-  context:
-    & {
-      input: TInput;
-      op: OperationRuntimeHandle<TProgress, TOutput>;
-      caller: unknown;
-      client: HandlerClient;
-    }
-    & TTransfer
-    & WithDeps<TDeps>,
-) => unknown | Promise<unknown>;
-
 export type TrellisJobsState = {};
 
 export interface TrellisJobsClient {
@@ -117,6 +77,10 @@ export interface TrellisJobsClient {
         input: Types.JobsGetInput,
         opts?: RequestOpts,
       ): AsyncResult<Types.JobsGetOutput, BaseError>;
+      getKey(
+        input: Types.JobsGetKeyInput,
+        opts?: RequestOpts,
+      ): AsyncResult<Types.JobsGetKeyOutput, BaseError>;
       health(
         input: Types.JobsHealthInput,
         opts?: RequestOpts,
@@ -153,12 +117,12 @@ export interface TrellisJobsClient {
     readonly health: {
       heartbeat: {
         publish(
-          event: Omit<HealthSdk.HealthHeartbeatEvent, "header">,
+          event: HealthSdk.HealthHeartbeatEvent,
         ): AsyncResult<void, ValidationError | UnexpectedError>;
         prepare(
-          event: Omit<HealthSdk.HealthHeartbeatEvent, "header">,
+          event: HealthSdk.HealthHeartbeatEvent,
         ): Result<
-          PreparedTrellisEvent<Omit<HealthSdk.HealthHeartbeatEvent, "header">>,
+          PreparedTrellisEvent<HealthSdk.HealthHeartbeatEvent>,
           ValidationError | UnexpectedError
         >;
         listen(
@@ -176,29 +140,22 @@ export interface TrellisJobsClient {
 
 export interface Service extends TrellisJobsClient {
   readonly handle: ServiceHandle;
-  with<TDeps>(deps: TDeps): ServiceWithDeps<TDeps>;
 }
 
-export type ServiceWithDeps<TDeps> = Omit<TrellisJobsClient, "event"> & {
-  readonly event: ServiceEventSurface<TDeps>;
-  readonly handle: ServiceHandle<TDeps>;
-  with<TNextDeps>(deps: TNextDeps): ServiceWithDeps<TNextDeps>;
-};
-
-export interface ServiceEventSurface<TDeps> {
+export interface ServiceEventSurface {
   readonly health: {
     heartbeat: {
       publish(
-        event: Omit<HealthSdk.HealthHeartbeatEvent, "header">,
+        event: HealthSdk.HealthHeartbeatEvent,
       ): AsyncResult<void, ValidationError | UnexpectedError>;
       prepare(
-        event: Omit<HealthSdk.HealthHeartbeatEvent, "header">,
+        event: HealthSdk.HealthHeartbeatEvent,
       ): Result<
-        PreparedTrellisEvent<Omit<HealthSdk.HealthHeartbeatEvent, "header">>,
+        PreparedTrellisEvent<HealthSdk.HealthHeartbeatEvent>,
         ValidationError | UnexpectedError
       >;
       listen(
-        handler: ServiceEventHandler<HealthSdk.HealthHeartbeatEvent, TDeps>,
+        handler: DependencyServiceEventHandler<HealthSdk.HealthHeartbeatEvent>,
         subjectData?: Record<string, unknown>,
         opts?: EventOpts,
       ): AsyncResult<void, ValidationError | UnexpectedError>;
@@ -206,60 +163,19 @@ export interface ServiceEventSurface<TDeps> {
   };
 }
 
-export interface ServiceHandle<TDeps = undefined> {
+export interface ServiceHandle {
   readonly rpc: {
     readonly jobs: {
-      cancel(
-        handler: RpcHandler<
-          Types.JobsCancelInput,
-          Types.JobsCancelOutput,
-          TDeps
-        >,
-      ): Promise<void>;
-      dismissDLQ(
-        handler: RpcHandler<
-          Types.JobsDismissDLQInput,
-          Types.JobsDismissDLQOutput,
-          TDeps
-        >,
-      ): Promise<void>;
-      get(
-        handler: RpcHandler<Types.JobsGetInput, Types.JobsGetOutput, TDeps>,
-      ): Promise<void>;
-      health(
-        handler: RpcHandler<
-          Types.JobsHealthInput,
-          Types.JobsHealthOutput,
-          TDeps
-        >,
-      ): Promise<void>;
-      list(
-        handler: RpcHandler<Types.JobsListInput, Types.JobsListOutput, TDeps>,
-      ): Promise<void>;
-      listDLQ(
-        handler: RpcHandler<
-          Types.JobsListDLQInput,
-          Types.JobsListDLQOutput,
-          TDeps
-        >,
-      ): Promise<void>;
-      listServices(
-        handler: RpcHandler<
-          Types.JobsListServicesInput,
-          Types.JobsListServicesOutput,
-          TDeps
-        >,
-      ): Promise<void>;
-      replayDLQ(
-        handler: RpcHandler<
-          Types.JobsReplayDLQInput,
-          Types.JobsReplayDLQOutput,
-          TDeps
-        >,
-      ): Promise<void>;
-      retry(
-        handler: RpcHandler<Types.JobsRetryInput, Types.JobsRetryOutput, TDeps>,
-      ): Promise<void>;
+      cancel(handler: Types.JobsCancelHandler): Promise<void>;
+      dismissDLQ(handler: Types.JobsDismissDLQHandler): Promise<void>;
+      get(handler: Types.JobsGetHandler): Promise<void>;
+      getKey(handler: Types.JobsGetKeyHandler): Promise<void>;
+      health(handler: Types.JobsHealthHandler): Promise<void>;
+      list(handler: Types.JobsListHandler): Promise<void>;
+      listDLQ(handler: Types.JobsListDLQHandler): Promise<void>;
+      listServices(handler: Types.JobsListServicesHandler): Promise<void>;
+      replayDLQ(handler: Types.JobsReplayDLQHandler): Promise<void>;
+      retry(handler: Types.JobsRetryHandler): Promise<void>;
     };
   };
   readonly feed: {};