@qlever-llc/trellis 0.10.3-rc.2 → 0.10.3

package/src/auth/protocol.ts

@@ -1,4 +1,4 @@
-import { ContractResourceBindingsSchema } from "@qlever-llc/trellis/contracts";
+import { ContractResourceBindingsSchema } from "../contracts.js";
 import type { StaticDecode } from "typebox";
 import { Type } from "typebox";
 import { PageResponseSchema } from "../contract_support/protocol.js";

package/src/generate.ts

@@ -76,6 +76,7 @@ async function runLocalGenerator(
 async function readPackageVersion(): Promise<string> {
   const manifest = await readFirstManifest([
     new URL("./deno.json", import.meta.url),
+    new URL("../package.json", import.meta.url),
     new URL("../../../package.json", import.meta.url),
   ]);
   if (typeof manifest.version !== "string" || !manifest.version.trim()) {

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

@@ -1,6 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.auth@v1.json
 import { OWNED_API } from "./owned_api.js";
-import { OWNED_API as HealthApi } from "../../health.js";
 
 export { OWNED_API };
 
@@ -10,7 +9,6 @@ export type UsedApi = {
   operations: {
   };
   events: {
-    readonly "Health.Heartbeat": typeof HealthApi.events["Health.Heartbeat"];
   };
   feeds: {
   };
@@ -24,7 +22,6 @@ export const USED_API: UsedApi = {
   operations: {
   },
   events: {
-    get "Health.Heartbeat"() { return HealthApi.events["Health.Heartbeat"]; },
   },
   feeds: {
   },

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

@@ -1,8 +1,7 @@
 // Generated from ./generated/contracts/manifests/trellis.auth@v1.json
-import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "@qlever-llc/trellis";
+import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "../../../index.js";
 import type { API, Api } from "./api.js";
 import type * as Types from "./types.js";
-import type * as HealthSdk from "../../health.js";
 
 type EventCallback<TMessage> = {
   bivarianceHack(message: TMessage): MaybeAsync<void, BaseError>;
@@ -111,9 +110,6 @@ export interface TrellisAuthClient {
       deviceUserAuthoritiesReviewRequested: { publish(event: Omit<Types.AuthDeviceUserAuthoritiesReviewRequestedEvent, "header">): AsyncResult<void, ValidationError | UnexpectedError>; prepare(event: Omit<Types.AuthDeviceUserAuthoritiesReviewRequestedEvent, "header">): Result<PreparedTrellisEvent<Omit<Types.AuthDeviceUserAuthoritiesReviewRequestedEvent, "header">>, ValidationError | UnexpectedError>; listen(handler: EventCallback<Types.AuthDeviceUserAuthoritiesReviewRequestedEvent>, subjectData?: Record<string, unknown>, opts?: EventOpts): AsyncResult<void, ValidationError | UnexpectedError>; };
       sessionsRevoked: { publish(event: Omit<Types.AuthSessionsRevokedEvent, "header">): AsyncResult<void, ValidationError | UnexpectedError>; prepare(event: Omit<Types.AuthSessionsRevokedEvent, "header">): Result<PreparedTrellisEvent<Omit<Types.AuthSessionsRevokedEvent, "header">>, ValidationError | UnexpectedError>; listen(handler: EventCallback<Types.AuthSessionsRevokedEvent>, subjectData?: Record<string, unknown>, opts?: EventOpts): AsyncResult<void, ValidationError | UnexpectedError>; };
     };
-    readonly health: {
-      heartbeat: { publish(event: Omit<HealthSdk.HealthHeartbeatEvent, "header">): AsyncResult<void, ValidationError | UnexpectedError>; prepare(event: Omit<HealthSdk.HealthHeartbeatEvent, "header">): Result<PreparedTrellisEvent<Omit<HealthSdk.HealthHeartbeatEvent, "header">>, ValidationError | UnexpectedError>; listen(handler: EventCallback<HealthSdk.HealthHeartbeatEvent>, subjectData?: Record<string, unknown>, opts?: EventOpts): AsyncResult<void, ValidationError | UnexpectedError>; };
-    };
   };
   readonly feed: {};
   readonly operation: {

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

@@ -1,5 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.auth@v1.json
-import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "@qlever-llc/trellis";
+import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "../../../index.js";
 import { API } from "./api.js";
 
 const CONTRACT_MODULE_METADATA = Symbol.for("@qlever-llc/trellis/contracts/contract-module");

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

@@ -1,6 +1,6 @@
 // Generated from ./generated/contracts/manifests/trellis.auth@v1.json
-import type { TrellisAPI } from "@qlever-llc/trellis/contracts";
-import { schema } from "@qlever-llc/trellis/contracts";
+import type { TrellisAPI } from "../../../contracts.js";
+import { schema } from "../../../contracts.js";
 import type * as Types from "./types.js";
 import { AuthCapabilitiesListRequestSchema, AuthCapabilitiesListResponseSchema, AuthCapabilityGroupsDeleteRequestSchema, AuthCapabilityGroupsDeleteResponseSchema, AuthCapabilityGroupsGetRequestSchema, AuthCapabilityGroupsGetResponseSchema, AuthCapabilityGroupsListRequestSchema, AuthCapabilityGroupsListResponseSchema, AuthCapabilityGroupsPutRequestSchema, AuthCapabilityGroupsPutResponseSchema, AuthCatalogIssuesResolveRequestSchema, AuthCatalogIssuesResolveResponseSchema, AuthConnectionsClosedEventSchema, AuthConnectionsKickRequestSchema, AuthConnectionsKickResponseSchema, AuthConnectionsKickedEventSchema, AuthConnectionsListRequestSchema, AuthConnectionsListResponseSchema, AuthConnectionsOpenedEventSchema, AuthDeploymentAuthorityAcceptMigrationRequestSchema, AuthDeploymentAuthorityAcceptResponseSchema, AuthDeploymentAuthorityAcceptUpdateRequestSchema, AuthDeploymentAuthorityGetRequestSchema, AuthDeploymentAuthorityGetResponseSchema, AuthDeploymentAuthorityGrantOverridesListRequestSchema, AuthDeploymentAuthorityGrantOverridesListResponseSchema, AuthDeploymentAuthorityGrantOverridesPutRequestSchema, AuthDeploymentAuthorityGrantOverridesRemoveRequestSchema, AuthDeploymentAuthorityGrantOverridesResponseSchema, AuthDeploymentAuthorityListRequestSchema, AuthDeploymentAuthorityListResponseSchema, AuthDeploymentAuthorityPlanRequestSchema, AuthDeploymentAuthorityPlanResponseSchema, AuthDeploymentAuthorityPlansGetRequestSchema, AuthDeploymentAuthorityPlansGetResponseSchema, AuthDeploymentAuthorityPlansListRequestSchema, AuthDeploymentAuthorityPlansListResponseSchema, AuthDeploymentAuthorityReconcileRequestSchema, AuthDeploymentAuthorityReconcileResponseSchema, AuthDeploymentAuthorityRejectRequestSchema, AuthDeploymentAuthorityRejectResponseSchema, AuthDeploymentsCreateRequestSchema, AuthDeploymentsCreateResponseSchema, AuthDeploymentsDisableRequestSchema, AuthDeploymentsDisableResponseSchema, AuthDeploymentsEnableRequestSchema, AuthDeploymentsEnableResponseSchema, AuthDeploymentsListRequestSchema, AuthDeploymentsListResponseSchema, AuthDeploymentsRemoveRequestSchema, AuthDeploymentsRemoveResponseSchema, AuthDeviceUserAuthoritiesApprovedEventSchema, AuthDeviceUserAuthoritiesListRequestSchema, AuthDeviceUserAuthoritiesListResponseSchema, AuthDeviceUserAuthoritiesRequestedEventSchema, AuthDeviceUserAuthoritiesResolvedEventSchema, AuthDeviceUserAuthoritiesReviewRequestedEventSchema, AuthDeviceUserAuthoritiesReviewsDecideRequestSchema, AuthDeviceUserAuthoritiesReviewsDecideResponseSchema, AuthDeviceUserAuthoritiesReviewsListRequestSchema, AuthDeviceUserAuthoritiesReviewsListResponseSchema, AuthDeviceUserAuthoritiesRevokeRequestSchema, AuthDeviceUserAuthoritiesRevokeResponseSchema, AuthDevicesConnectInfoGetRequestSchema, AuthDevicesConnectInfoGetResponseSchema, AuthDevicesDisableRequestSchema, AuthDevicesDisableResponseSchema, AuthDevicesEnableRequestSchema, AuthDevicesEnableResponseSchema, AuthDevicesListRequestSchema, AuthDevicesListResponseSchema, AuthDevicesProvisionRequestSchema, AuthDevicesProvisionResponseSchema, AuthDevicesRemoveRequestSchema, AuthDevicesRemoveResponseSchema, AuthIdentitiesListRequestSchema, AuthIdentitiesListResponseSchema, AuthIdentityGrantsListRequestSchema, AuthIdentityGrantsListResponseSchema, AuthIdentityGrantsRevokeRequestSchema, AuthIdentityGrantsRevokeResponseSchema, AuthPortalsGetRequestSchema, AuthPortalsGetResponseSchema, AuthPortalsListRequestSchema, AuthPortalsListResponseSchema, AuthPortalsLoginSettingsGetRequestSchema, AuthPortalsLoginSettingsResponseSchema, AuthPortalsLoginSettingsUpdateRequestSchema, AuthPortalsPutRequestSchema, AuthPortalsPutResponseSchema, AuthPortalsRemoveRequestSchema, AuthPortalsRemoveResponseSchema, AuthPortalsRoutesPutRequestSchema, AuthPortalsRoutesPutResponseSchema, AuthPortalsRoutesRemoveRequestSchema, AuthPortalsRoutesRemoveResponseSchema, AuthRequestsValidateRequestSchema, AuthRequestsValidateResponseSchema, AuthResolveDeviceUserAuthoritiesProgressSchema, AuthResolveDeviceUserAuthoritiesRequestSchema, AuthResolveDeviceUserAuthoritiesResponseSchema, AuthServiceInstancesDisableRequestSchema, AuthServiceInstancesDisableResponseSchema, AuthServiceInstancesEnableRequestSchema, AuthServiceInstancesEnableResponseSchema, AuthServiceInstancesListRequestSchema, AuthServiceInstancesListResponseSchema, AuthServiceInstancesProvisionRequestSchema, AuthServiceInstancesProvisionResponseSchema, AuthServiceInstancesRemoveRequestSchema, AuthServiceInstancesRemoveResponseSchema, AuthSessionsListRequestSchema, AuthSessionsListResponseSchema, AuthSessionsLogoutRequestSchema, AuthSessionsLogoutResponseSchema, AuthSessionsMeRequestSchema, AuthSessionsMeResponseSchema, AuthSessionsRevokeRequestSchema, AuthSessionsRevokeResponseSchema, AuthSessionsRevokedEventSchema, AuthUserIdentitiesListRequestSchema, AuthUserIdentitiesListResponseSchema, AuthUserIdentitiesUnlinkRequestSchema, AuthUserIdentitiesUnlinkResponseSchema, AuthUsersAccountFlowCreateResponseSchema, AuthUsersCreateRequestSchema, AuthUsersCreateResponseSchema, AuthUsersGetRequestSchema, AuthUsersGetResponseSchema, AuthUsersIdentityLinkCreateRequestSchema, AuthUsersListRequestSchema, AuthUsersListResponseSchema, AuthUsersPasswordChangeRequestSchema, AuthUsersPasswordChangeResponseSchema, AuthUsersPasswordResetCreateRequestSchema, AuthUsersUpdateRequestSchema, AuthUsersUpdateResponseSchema, HealthRequestSchema, HealthResponseSchema } from "./schemas.js";
 

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

@@ -1,5 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.auth@v1.json
-import type { RpcHandlerFn } from "@qlever-llc/trellis";
+import type { RpcHandlerFn } from "../../../index.js";
 import type { API } from "./api.js";
 
 export const CONTRACT_ID = "trellis.auth@v1" as const;

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

@@ -1,6 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.core@v1.json
 import { OWNED_API } from "./owned_api.js";
-import { OWNED_API as HealthApi } from "../../health.js";
 
 export { OWNED_API };
 
@@ -10,7 +9,6 @@ export type UsedApi = {
   operations: {
   };
   events: {
-    readonly "Health.Heartbeat": typeof HealthApi.events["Health.Heartbeat"];
   };
   feeds: {
   };
@@ -24,7 +22,6 @@ export const USED_API: UsedApi = {
   operations: {
   },
   events: {
-    get "Health.Heartbeat"() { return HealthApi.events["Health.Heartbeat"]; },
   },
   feeds: {
   },

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

@@ -1,8 +1,7 @@
 // Generated from ./generated/contracts/manifests/trellis.core@v1.json
-import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "@qlever-llc/trellis";
+import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "../../../index.js";
 import type { API, Api } from "./api.js";
 import type * as Types from "./types.js";
-import type * as HealthSdk from "../../health.js";
 
 type EventCallback<TMessage> = {
   bivarianceHack(message: TMessage): MaybeAsync<void, BaseError>;
@@ -28,11 +27,7 @@ export interface TrellisCoreClient {
       surfaceStatus(input: Types.TrellisSurfaceStatusInput, opts?: RequestOpts): AsyncResult<Types.TrellisSurfaceStatusOutput, BaseError>;
     };
   };
-  readonly event: {
-    readonly health: {
-      heartbeat: { publish(event: Omit<HealthSdk.HealthHeartbeatEvent, "header">): AsyncResult<void, ValidationError | UnexpectedError>; prepare(event: Omit<HealthSdk.HealthHeartbeatEvent, "header">): Result<PreparedTrellisEvent<Omit<HealthSdk.HealthHeartbeatEvent, "header">>, ValidationError | UnexpectedError>; listen(handler: EventCallback<HealthSdk.HealthHeartbeatEvent>, subjectData?: Record<string, unknown>, opts?: EventOpts): AsyncResult<void, ValidationError | UnexpectedError>; };
-    };
-  };
+  readonly event: {};
   readonly feed: {};
   readonly operation: {};
   wait(): AsyncResult<void, BaseError>;

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

@@ -1,5 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.core@v1.json
-import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "@qlever-llc/trellis";
+import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "../../../index.js";
 import { API } from "./api.js";
 
 const CONTRACT_MODULE_METADATA = Symbol.for("@qlever-llc/trellis/contracts/contract-module");

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

@@ -1,6 +1,6 @@
 // Generated from ./generated/contracts/manifests/trellis.core@v1.json
-import type { TrellisAPI } from "@qlever-llc/trellis/contracts";
-import { schema } from "@qlever-llc/trellis/contracts";
+import type { TrellisAPI } from "../../../contracts.js";
+import { schema } from "../../../contracts.js";
 import type * as Types from "./types.js";
 import { TrellisBindingsGetRequestSchema, TrellisBindingsGetResponseSchema, TrellisCatalogRequestSchema, TrellisCatalogResponseSchema, TrellisContractGetRequestSchema, TrellisContractGetResponseSchema, TrellisSurfaceStatusRequestSchema, TrellisSurfaceStatusResponseSchema } from "./schemas.js";
 

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

@@ -1,5 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.core@v1.json
-import type { RpcHandlerFn } from "@qlever-llc/trellis";
+import type { RpcHandlerFn } from "../../../index.js";
 import type { API } from "./api.js";
 
 export const CONTRACT_ID = "trellis.core@v1" as const;

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

@@ -1,5 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.health@v1.json
-import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "@qlever-llc/trellis";
+import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "../../../index.js";
 import type { API, Api } from "./api.js";
 import type * as Types from "./types.js";
 

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

@@ -1,5 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.health@v1.json
-import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "@qlever-llc/trellis";
+import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "../../../index.js";
 import { API } from "./api.js";
 
 const CONTRACT_MODULE_METADATA = Symbol.for("@qlever-llc/trellis/contracts/contract-module");

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

@@ -1,6 +1,6 @@
 // Generated from ./generated/contracts/manifests/trellis.health@v1.json
-import type { TrellisAPI } from "@qlever-llc/trellis/contracts";
-import { schema } from "@qlever-llc/trellis/contracts";
+import type { TrellisAPI } from "../../../contracts.js";
+import { schema } from "../../../contracts.js";
 import type * as Types from "./types.js";
 import { HealthHeartbeatSchema } from "./schemas.js";
 

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

@@ -1,8 +1,8 @@
 // Generated from ./generated/contracts/manifests/trellis.jobs@v1.json
 import { OWNED_API } from "./owned_api.js";
-import { OWNED_API as AuthApi } from "../../auth.js";
-import { OWNED_API as CoreApi } from "../../core.js";
-import { OWNED_API as HealthApi } from "../../health.js";
+import { OWNED_API as AuthApi } from "../auth/mod.js";
+import { OWNED_API as CoreApi } from "../core/mod.js";
+import { OWNED_API as HealthApi } from "../health/mod.js";
 
 export { OWNED_API };
 

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

@@ -1,10 +1,10 @@
 // Generated from ./generated/contracts/manifests/trellis.jobs@v1.json
-import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "@qlever-llc/trellis";
+import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "../../../index.js";
 import type { API, Api } from "./api.js";
 import type * as Types from "./types.js";
-import type * as AuthSdk from "../../auth.js";
-import type * as CoreSdk from "../../core.js";
-import type * as HealthSdk from "../../health.js";
+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 EventCallback<TMessage> = {
   bivarianceHack(message: TMessage): MaybeAsync<void, BaseError>;

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

@@ -1,5 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.jobs@v1.json
-import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "@qlever-llc/trellis";
+import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "../../../index.js";
 import { API } from "./api.js";
 
 const CONTRACT_MODULE_METADATA = Symbol.for("@qlever-llc/trellis/contracts/contract-module");

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

@@ -1,6 +1,6 @@
 // Generated from ./generated/contracts/manifests/trellis.jobs@v1.json
-import type { TrellisAPI } from "@qlever-llc/trellis/contracts";
-import { schema } from "@qlever-llc/trellis/contracts";
+import type { TrellisAPI } from "../../../contracts.js";
+import { schema } from "../../../contracts.js";
 import * as Types from "./types.js";
 import { EmptySchema, JobsCancelRequestSchema, JobsCancelResponseSchema, JobsDismissDLQRequestSchema, JobsDismissDLQResponseSchema, JobsGetRequestSchema, JobsGetResponseSchema, JobsHealthResponseSchema, JobsListDLQRequestSchema, JobsListDLQResponseSchema, JobsListRequestSchema, JobsListResponseSchema, JobsListServicesRequestSchema, JobsListServicesResponseSchema, JobsReplayDLQRequestSchema, JobsReplayDLQResponseSchema, JobsRetryRequestSchema, JobsRetryResponseSchema, NotFoundErrorDataSchema } from "./schemas.js";
 

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

@@ -1,8 +1,8 @@
 // Generated from ./generated/contracts/manifests/trellis.jobs@v1.json
-import type { RpcHandlerFn } from "@qlever-llc/trellis";
+import type { RpcHandlerFn } from "../../../index.js";
 import type { API } from "./api.js";
 
-import { TrellisError, type SerializableErrorData } from "@qlever-llc/trellis";
+import { TrellisError, type SerializableErrorData } from "../../../index.js";
 
 import { NotFoundErrorDataSchema } from "./schemas.js";
 

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

@@ -1,6 +1,6 @@
 // Generated from ./generated/contracts/manifests/trellis.state@v1.json
 import { OWNED_API } from "./owned_api.js";
-import { OWNED_API as HealthApi } from "../../health.js";
+import { OWNED_API as HealthApi } from "../health/mod.js";
 
 export { OWNED_API };
 

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

@@ -1,8 +1,8 @@
 // Generated from ./generated/contracts/manifests/trellis.state@v1.json
-import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "@qlever-llc/trellis";
+import type { AcceptedOperation, AsyncResult, BaseError, EventOpts, FeedSubscribeOpts, FeedSubscription, HandlerTrellis, MapStateStoreClient, MaybeAsync, OperationInputBuilder, OperationObserverCallbacks, OperationRef, OperationRefData, OperationRuntimeHandle, PreparedTrellisEvent, ReceiveTransferGrant, ReceiveTransferHandle, RequestOpts, Result, RpcHandlerContext, SendTransferGrant, SendTransferHandle, TerminalOperation, TransferCapableOperationInputBuilder, TrellisConnection, UnexpectedError, ValidationError, ValueStateStoreClient } from "../../../index.js";
 import type { API, Api } from "./api.js";
 import type * as Types from "./types.js";
-import type * as HealthSdk from "../../health.js";
+import type * as HealthSdk from "../health/mod.js";
 
 type EventCallback<TMessage> = {
   bivarianceHack(message: TMessage): MaybeAsync<void, BaseError>;

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

@@ -1,5 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.state@v1.json
-import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "@qlever-llc/trellis";
+import type { ContractDependencyUse, SdkContractModule, TrellisContractV1, UseSpec } from "../../../index.js";
 import { API } from "./api.js";
 
 const CONTRACT_MODULE_METADATA = Symbol.for("@qlever-llc/trellis/contracts/contract-module");

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

@@ -1,6 +1,6 @@
 // Generated from ./generated/contracts/manifests/trellis.state@v1.json
-import type { TrellisAPI } from "@qlever-llc/trellis/contracts";
-import { schema } from "@qlever-llc/trellis/contracts";
+import type { TrellisAPI } from "../../../contracts.js";
+import { schema } from "../../../contracts.js";
 import type * as Types from "./types.js";
 import { StateAdminDeleteRequestSchema, StateAdminDeleteResponseSchema, StateAdminGetRequestSchema, StateAdminGetResponseSchema, StateAdminListRequestSchema, StateAdminListResponseSchema, StateDeleteRequestSchema, StateDeleteResponseSchema, StateGetRequestSchema, StateGetResponseSchema, StateListRequestSchema, StateListResponseSchema, StatePutRequestSchema, StatePutResponseSchema } from "./schemas.js";
 

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

@@ -1,5 +1,5 @@
 // Generated from ./generated/contracts/manifests/trellis.state@v1.json
-import type { RpcHandlerFn } from "@qlever-llc/trellis";
+import type { RpcHandlerFn } from "../../../index.js";
 import type { API } from "./api.js";
 
 export const CONTRACT_ID = "trellis.state@v1" as const;

package/src/server/health.ts

@@ -11,8 +11,8 @@ import * as dntShim from "../_dnt.shims.js";
 
 
 import { type Result } from "@qlever-llc/result";
-import type { JsonValue } from "@qlever-llc/trellis/contracts";
-import { type TrellisError } from "@qlever-llc/trellis";
+import type { JsonValue } from "../contracts.js";
+import { type TrellisError } from "../errors/index.js";
 import { ulid } from "ulid";
 
 type MaybePromise<T> = T | Promise<T>;

package/src/server/health_rpc.ts

@@ -1,4 +1,4 @@
-import type { TrellisAPI } from "@qlever-llc/trellis/contracts";
+import type { TrellisAPI } from "../contracts.js";
 
 import { Result } from "@qlever-llc/result";
 import {

package/src/server/service.ts

@@ -12,7 +12,7 @@ import {
   TypedKV,
   TypedStore,
   TypedStoreEntry,
-} from "@qlever-llc/trellis";
+} from "../index.js";
 import { sdk as trellisAuth } from "../sdk/auth.js";
 import {
   TrellisServiceRuntime,
@@ -24,12 +24,12 @@ import {
   type SentinelCreds,
   SentinelCredsSchema,
   type TrellisAuth as SessionAuth,
-} from "@qlever-llc/trellis/auth";
+} from "../auth.js";
 import {
   ContractResourceBindingsSchema,
   type InferSchemaType,
-} from "@qlever-llc/trellis/contracts";
-import type { TrellisAPI } from "@qlever-llc/trellis/contracts";
+} from "../contracts.js";
+import type { TrellisAPI } from "../contracts.js";
 import type { TrellisContractV1 } from "../contract_support/mod.js";
 import type {
   ContractEventConsumers,
@@ -45,7 +45,7 @@ import { Type } from "typebox";
 import { Value } from "typebox/value";
 import { type HealthCheckFn, ServiceHealth } from "./health.js";
 import { mountStandardHealthRpc } from "./health_rpc.js";
-import type { RPCDesc } from "@qlever-llc/trellis/contracts";
+import type { RPCDesc } from "../contracts.js";
 import type {
   AcceptedOperation,
   ActiveEventFacade,

package/src/server/subscription.ts

@@ -1,8 +1,5 @@
 import type { JsMsg } from "@nats-io/jetstream";
-import type {
-  InferSchemaType,
-  TrellisAPI,
-} from "@qlever-llc/trellis/contracts";
+import type { InferSchemaType, TrellisAPI } from "../contracts.js";
 
 /**
  * Context provided to event handlers with message metadata and acknowledgment controls.

package/esm/npm/src/_dnt.polyfills.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_dnt.polyfills.d.ts","sourceRoot":"","sources":["../../../src/_dnt.polyfills.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK;QACb,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB;CACF;AAED,OAAO,EAAE,CAAC;AAgBV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd;;;;WAIG;QACH,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;KAC5C;CACF;AAED,OAAO,EAAE,CAAC;AACV;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAgC,KAAK,GAAG,EAAE,MAAM,UAAU,CAAC;AAGlE,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU;QAClB;;;;;;;;;;;;;;WAcG;QACH,GAAG,EAAE,MAAM,CAAC;QACZ;;;;;;;;;;;;WAYG;QACH,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,GAAG,MAAM,CAAC;QACtE;;;;;;;;WAQG;QACH,IAAI,EAAE,OAAO,CAAC;QAEd;;;;;;;;;;;;WAYG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;;;;;;;;;;;WAYG;QACH,OAAO,EAAE,MAAM,CAAC;KACjB;CACF;AAED,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;AACpD,KAAK,UAAU,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,UAAU,0BAA0B;IAClC,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,CAAC;CACxD;AACD,UAAU,0BAA0B;IAClC,CAAC,UAAU,EAAE,UAAU,GAAG,UAAU,CAAC;CACtC;AACD,UAAU,kBACR,SAAQ,0BAA0B,EAAE,0BAA0B;CAC/D;AAiBD,eAAO,IAAI,6BAA6B,EA2BnC,0BAA0B,CAAC;AAMhC,eAAO,IAAI,6BAA6B,EA4DnC,0BAA0B,CAAC;AAMhC,eAAO,IAAI,oBAAoB,EAoB1B,kBAAkB,CAAC"}

package/esm/npm/src/_dnt.shims.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_dnt.shims.d.ts","sourceRoot":"","sources":["../../../src/_dnt.shims.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAKvC,eAAO,MAAM,aAAa;;CAA2C,CAAC"}

package/esm/npm/src/auth/browser/login.d.ts

@@ -1,34 +0,0 @@
-import { type AuthStartResponse, type BindResponse, type BindSuccessResponse } from "../schemas.js";
-import type { SessionKeyHandle } from "./session.js";
-export type { AuthStartFlowResponse, AuthStartRequest, AuthStartResponse, BindResponse, BindSuccessResponse, ContractApproval, SentinelCreds, } from "../schemas.js";
-export type AuthConfig = {
-    authUrl: string;
-};
-export declare function buildLoginUrl(config: AuthConfig, provider: string | undefined, redirectTo: string, handle: SessionKeyHandle, contract: Record<string, unknown>, context?: unknown): Promise<string>;
-export declare function buildLoginUrl(args: {
-    authUrl: string;
-    provider?: string;
-    redirectTo: string;
-    handle: SessionKeyHandle;
-    contract: Record<string, unknown>;
-    context?: unknown;
-}): Promise<string>;
-export declare function buildLoginUrl(args: {
-    config: AuthConfig;
-    provider?: string;
-    redirectTo: string;
-    handle: SessionKeyHandle;
-    contract: Record<string, unknown>;
-    context?: unknown;
-}): Promise<string>;
-export declare function startAuthRequest(args: {
-    authUrl: string;
-    provider?: string;
-    redirectTo: string;
-    handle: SessionKeyHandle;
-    contract: Record<string, unknown>;
-    context?: unknown;
-}): Promise<AuthStartResponse>;
-export declare function isBindSuccessResponse(response: BindResponse): response is BindSuccessResponse;
-export declare function bindFlow(config: AuthConfig, handle: SessionKeyHandle, flowId: string): Promise<BindResponse>;
-//# sourceMappingURL=login.d.ts.map

package/esm/npm/src/auth/browser/login.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../../src/auth/browser/login.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,iBAAiB,EAEtB,KAAK,YAAY,EAEjB,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGrD,YAAY,EACV,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,EACZ,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,GACd,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA2BF,wBAAsB,aAAa,CACjC,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;AACnB,wBAAsB,aAAa,CACjC,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACA,OAAO,CAAC,MAAM,CAAC,CAAC;AACnB,wBAAsB,aAAa,CACjC,IAAI,EAAE;IACJ,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACA,OAAO,CAAC,MAAM,CAAC,CAAC;AA0CnB,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAqD7B;AA0ED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,YAAY,GACrB,QAAQ,IAAI,mBAAmB,CAEjC;AAED,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CAwBvB"}

package/esm/npm/src/auth/browser/login.js

@@ -1,141 +0,0 @@
-import { Value } from "typebox/value";
-import { digestContractManifest, } from "../../contract_support/mod.js";
-import { AuthStartRequestSchema, AuthStartResponseSchema, BindResponseSchema, } from "../schemas.js";
-import { bindFlowSig, getPublicSessionKey, oauthInitSig } from "./session.js";
-function contextRecord(value) {
-    if (!value || typeof value !== "object" || Array.isArray(value)) {
-        return undefined;
-    }
-    return value;
-}
-export async function buildLoginUrl(argsOrConfig, provider, redirectTo, handle, contract, context) {
-    const resolved = isNestedBuildLoginUrlArgs(argsOrConfig)
-        ? argsOrConfig
-        : isFlatBuildLoginUrlArgs(argsOrConfig)
-            ? {
-                config: { authUrl: argsOrConfig.authUrl },
-                provider: argsOrConfig.provider,
-                redirectTo: argsOrConfig.redirectTo,
-                handle: argsOrConfig.handle,
-                contract: argsOrConfig.contract,
-                context: argsOrConfig.context,
-            }
-            : buildLoginUrlArgsFromPositional(argsOrConfig, provider, redirectTo, handle, contract, context);
-    const response = await startAuthRequest({
-        authUrl: resolved.config.authUrl,
-        provider: resolved.provider,
-        redirectTo: resolved.redirectTo,
-        handle: resolved.handle,
-        contract: resolved.contract,
-        context: resolved.context,
-    });
-    if (response.status !== "flow_started") {
-        throw new Error("Auth request completed without starting a browser flow");
-    }
-    return response.loginUrl;
-}
-export async function startAuthRequest(args) {
-    const context = contextRecord(args.context);
-    const contractDigest = isTrellisContractV1(args.contract)
-        ? digestContractManifest(args.contract)
-        : undefined;
-    const sig = await oauthInitSig(args.handle, args.redirectTo, context, args.provider, contractDigest ?? args.contract);
-    const request = Value.Parse(AuthStartRequestSchema, {
-        redirectTo: args.redirectTo,
-        sessionKey: getPublicSessionKey(args.handle),
-        sig,
-        ...(contractDigest ? { contractDigest } : { contract: args.contract }),
-        ...(args.provider ? { provider: args.provider } : {}),
-        ...(context ? { context } : {}),
-    });
-    let response = await fetch(`${args.authUrl}/auth/requests`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(request),
-    });
-    if (await authStartNeedsManifest(response)) {
-        const fullSig = await oauthInitSig(args.handle, args.redirectTo, context, args.provider, args.contract);
-        response = await fetch(`${args.authUrl}/auth/requests`, {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({
-                ...request,
-                sig: fullSig,
-                contract: args.contract,
-            }),
-        });
-    }
-    if (!response.ok) {
-        const text = await response.text();
-        throw new Error(`Auth request failed: ${response.status} ${text}`);
-    }
-    return Value.Parse(AuthStartResponseSchema, await response.json());
-}
-async function authStartNeedsManifest(response) {
-    if (response.ok || response.status !== 409)
-        return false;
-    const clone = response.clone();
-    let payload;
-    try {
-        payload = await clone.json();
-    }
-    catch {
-        payload = undefined;
-    }
-    if (payload && typeof payload === "object") {
-        const record = payload;
-        return record.reason === "manifest_required" ||
-            record.code === "manifest_required" ||
-            record.error === "manifest_required" ||
-            record.message === "manifest_required";
-    }
-    return (await response.clone().text()).includes("manifest_required");
-}
-function buildLoginUrlArgsFromPositional(config, provider, redirectTo, handle, contract, context) {
-    if (redirectTo === undefined || handle === undefined || contract === undefined) {
-        throw new TypeError("buildLoginUrl requires redirectTo, handle, and contract");
-    }
-    return {
-        config,
-        provider,
-        redirectTo,
-        handle,
-        contract,
-        context,
-    };
-}
-function isTrellisContractV1(contract) {
-    return contract.format === "trellis.contract.v1" &&
-        typeof contract.id === "string" &&
-        typeof contract.displayName === "string" &&
-        typeof contract.description === "string" &&
-        typeof contract.kind === "string";
-}
-function isNestedBuildLoginUrlArgs(value) {
-    return "config" in value;
-}
-function isFlatBuildLoginUrlArgs(value) {
-    return "authUrl" in value && "redirectTo" in value && "handle" in value &&
-        "contract" in value;
-}
-export function isBindSuccessResponse(response) {
-    return response.status === "bound";
-}
-export async function bindFlow(config, handle, flowId) {
-    const sessionKey = getPublicSessionKey(handle);
-    const sig = await bindFlowSig(handle, flowId);
-    const response = await fetch(`${config.authUrl}/auth/flow/${encodeURIComponent(flowId)}/bind`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ sessionKey, sig }),
-    });
-    if (!response.ok) {
-        const text = await response.text();
-        throw new Error(`Bind failed: ${response.status} ${text}`);
-    }
-    const payload = await response.json();
-    if (payload && typeof payload === "object" && payload.status === "expired") {
-        throw new Error("Bind failed: expired");
-    }
-    return Value.Parse(BindResponseSchema, payload);
-}

package/esm/npm/src/auth/browser/portal.d.ts

@@ -1,11 +0,0 @@
-import { type PortalFlowState } from "../protocol.js";
-import type { ApprovalDecision } from "../schemas.js";
-import type { AuthConfig } from "./login.js";
-export type { PortalFlowState } from "../protocol.js";
-export type { ApprovalDecision } from "../schemas.js";
-export declare function portalFlowIdFromUrl(url: URL): string | null;
-export declare function fetchPortalFlowState(config: AuthConfig, flowId: string): Promise<PortalFlowState>;
-export declare function portalProviderLoginUrl(config: AuthConfig, providerId: string, flowId: string): string;
-export declare function submitPortalApproval(config: AuthConfig, flowId: string, decision: ApprovalDecision): Promise<PortalFlowState>;
-export declare function portalRedirectLocation(state: PortalFlowState | null): string | null;
-//# sourceMappingURL=portal.d.ts.map

package/esm/npm/src/auth/browser/portal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"portal.d.ts","sourceRoot":"","sources":["../../../../../src/auth/browser/portal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAyB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAMtD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAE3D;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,CAAC,CAY1B;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAKR;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,eAAe,CAAC,CAkB1B;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,eAAe,GAAG,IAAI,GAC5B,MAAM,GAAG,IAAI,CAIf"}