@qlever-llc/trellis 0.5.1 → 0.6.0

package/script/trellis/kv.d.ts

@@ -1,8 +1,8 @@
 import { type KV, type KvEntry } from "@nats-io/kv";
 import type { NatsConnection } from "@nats-io/nats-core/internal";
-import { Result } from "@qlever-llc/trellis-result";
+import { Result } from "@qlever-llc/result";
 import type { StaticDecode, TSchema } from "typebox";
-import { KVError, ValidationError } from "./errors/index.js";
+import { KVError, ValidationError } from "./errors/index.ts";
 /**
  * Represents a watch event emitted when a KV entry changes.
  */
@@ -29,6 +29,7 @@ export declare class TypedKV<S extends TSchema> {
     readonly schema: S;
     readonly kv: KV;
     private constructor();
+    private static fromParts;
     static open<S extends TSchema>(nats: NatsConnection, name: string, schema: S, options: {
         history?: number;
         ttl?: number;
@@ -36,8 +37,9 @@ export declare class TypedKV<S extends TSchema> {
         maxValueBytes?: number;
     }): Promise<Result<TypedKV<S>, KVError>>;
     get(key: string): Promise<Result<TypedKVEntry<S>, KVError | ValidationError>>;
-    create(key: string, value: StaticDecode<S>): Promise<Result<void, KVError>>;
-    put(key: string, value: StaticDecode<S>): Promise<Result<void, KVError>>;
+    private serialize;
+    create(key: string, value: unknown): Promise<Result<void, KVError>>;
+    put(key: string, value: unknown): Promise<Result<void, KVError>>;
     delete(key: string): Promise<Result<void, KVError>>;
     keys(filter?: string | string[]): Promise<Result<AsyncIterable<string>, KVError>>;
     status(): Promise<Result<{
@@ -45,11 +47,12 @@ export declare class TypedKV<S extends TSchema> {
     }, KVError>>;
 }
 export declare class TypedKVEntry<S extends TSchema> {
+    #private;
     private schema;
     private kv;
     private entry;
-    readonly value: StaticDecode<S>;
-    constructor(schema: S, kv: KV, entry: KvEntry, value: StaticDecode<S>);
+    constructor(schema: S, kv: KV, entry: KvEntry, value: unknown);
+    get value(): StaticDecode<S>;
     static create<S extends TSchema>(schema: S, kv: KV, entry: KvEntry): Promise<Result<TypedKVEntry<S>, ValidationError>>;
     get key(): string;
     /**
@@ -60,8 +63,8 @@ export declare class TypedKVEntry<S extends TSchema> {
      * @returns A function to stop watching
      */
     watch(callback: (event: WatchEvent<S>) => void, opts?: WatchOptions): Promise<() => void>;
-    merge(value: Partial<StaticDecode<S>>, vcc?: boolean): Promise<Result<void, KVError | ValidationError>>;
-    put(value: StaticDecode<S>, vcc?: boolean): Promise<Result<void, KVError>>;
+    merge(value: unknown, vcc?: boolean): Promise<Result<void, KVError | ValidationError>>;
+    put(value: unknown, vcc?: boolean): Promise<Result<void, KVError>>;
     delete(vcc?: boolean): Promise<Result<void, KVError>>;
 }
 //# sourceMappingURL=kv.d.ts.map

package/script/trellis/kv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kv.d.ts","sourceRoot":"","sources":["../../src/trellis/kv.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kv.d.ts","sourceRoot":"","sources":["../../../kv.ts"],"names":[],"mappings":"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"}

package/script/trellis/kv.js

@@ -22,15 +22,25 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TypedKVEntry_value;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypedKVEntry = exports.TypedKV = void 0;
-// @ts-nocheck -- svelte-check hits pathological generic instantiation in this file
 const kv_1 = require("@nats-io/kv");
-const trellis_result_1 = require("@qlever-llc/trellis-result");
-const ts_deepmerge_1 = require("ts-deepmerge");
+const result_1 = require("@qlever-llc/result");
 const value_1 = __importStar(require("typebox/value"));
-const index_js_1 = require("./errors/index.js");
-const helpers_js_1 = require("./helpers.js");
+const index_ts_1 = require("./errors/index.ts");
+const helpers_ts_1 = require("./helpers.ts");
 function externalizeValue(value) {
     if (value instanceof Date) {
         return value.toISOString();
@@ -61,6 +71,21 @@ function serializeValue(schema, value) {
 function serializeExternalValue(schema, value) {
     return serializeValue(schema, value);
 }
+function isPlainObject(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function mergeUnknown(target, source) {
+    if (!isPlainObject(target) || !isPlainObject(source)) {
+        return source;
+    }
+    const out = { ...target };
+    for (const [key, entry] of Object.entries(source)) {
+        if (entry === undefined)
+            continue;
+        out[key] = mergeUnknown(target[key], entry);
+    }
+    return out;
+}
 class TypedKV {
     constructor(schema, kv) {
         Object.defineProperty(this, "schema", {
@@ -76,6 +101,9 @@ class TypedKV {
             value: kv
         });
     }
+    static fromParts(schema, kv) {
+        return new TypedKV(schema, kv);
+    }
     static async open(nats, name, schema, options) {
         try {
             const kvm = new kv_1.Kvm(nats);
@@ -86,79 +114,75 @@ class TypedKV {
                     ttl: options.ttl ?? 0,
                     ...(options.maxValueBytes ? { maxValueSize: options.maxValueBytes } : {}),
                 });
-            const typedKv = new TypedKV(schema, kv);
-            return trellis_result_1.Result.ok(typedKv);
+            const typedKv = TypedKV.fromParts(schema, kv);
+            return result_1.Result.ok(typedKv);
         }
         catch (cause) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "open", cause }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "open", cause }));
         }
     }
     async get(key) {
         let s;
         try {
-            s = await this.kv.get((0, helpers_js_1.escapeKvKey)(key));
+            s = await this.kv.get((0, helpers_ts_1.escapeKvKey)(key));
         }
         catch (cause) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "get", cause, context: { key } }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "get", cause, context: { key } }));
         }
         if (!s) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({
+            return result_1.Result.err(new index_ts_1.KVError({
                 operation: "get",
                 context: { key, reason: "not found" },
             }));
         }
-        return await createTypedKvEntry(this.schema, this.kv, s);
+        const result = await createTypedKvEntry(this.schema, this.kv, s);
+        return result;
+    }
+    serialize(value) {
+        return serializeExternalValue(this.schema, value);
     }
     async create(key, value) {
-        const schema = this.schema;
-        const rawValue = value;
-        // @ts-expect-error svelte-check hits excessive type instantiation here
-        const serialized = serializeExternalValue(schema, rawValue);
         try {
-            await this.kv.create((0, helpers_js_1.escapeKvKey)(key), serialized);
-            return trellis_result_1.Result.ok(undefined);
+            await this.kv.create((0, helpers_ts_1.escapeKvKey)(key), this.serialize(value));
+            return result_1.Result.ok(undefined);
         }
         catch (cause) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "create", cause, context: { key } }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "create", cause, context: { key } }));
         }
     }
     async put(key, value) {
-        const schema = this.schema;
-        const rawValue = value;
-        // @ts-expect-error svelte-check hits excessive type instantiation here
-        const serialized = serializeExternalValue(schema, rawValue);
         try {
-            await this.kv.put((0, helpers_js_1.escapeKvKey)(key), serialized);
-            return trellis_result_1.Result.ok(undefined);
+            await this.kv.put((0, helpers_ts_1.escapeKvKey)(key), this.serialize(value));
+            return result_1.Result.ok(undefined);
         }
         catch (cause) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "put", cause, context: { key } }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "put", cause, context: { key } }));
         }
     }
     async delete(key) {
         try {
-            await this.kv.delete((0, helpers_js_1.escapeKvKey)(key));
-            return trellis_result_1.Result.ok(undefined);
+            await this.kv.delete((0, helpers_ts_1.escapeKvKey)(key));
+            return result_1.Result.ok(undefined);
         }
         catch (cause) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "delete", cause, context: { key } }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "delete", cause, context: { key } }));
         }
     }
     async keys(filter = ">") {
         try {
-            return trellis_result_1.Result.ok(await this.kv.keys(filter));
+            return result_1.Result.ok(await this.kv.keys(filter));
         }
         catch (cause) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "keys", cause, context: { filter } }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "keys", cause, context: { filter } }));
         }
     }
     async status() {
         try {
             const status = await this.kv.status();
-            return trellis_result_1.Result.ok({ values: status.values });
+            return result_1.Result.ok({ values: status.values });
         }
         catch (cause) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "status", cause }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "status", cause }));
         }
     }
 }
@@ -183,20 +207,18 @@ class TypedKVEntry {
             writable: true,
             value: entry
         });
-        Object.defineProperty(this, "value", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        // @ts-expect-error svelte-check hits excessive type instantiation on assignment
-        this.value = value;
+        _TypedKVEntry_value.set(this, void 0);
+        __classPrivateFieldSet(this, _TypedKVEntry_value, value, "f");
+    }
+    get value() {
+        return __classPrivateFieldGet(this, _TypedKVEntry_value, "f");
     }
     static async create(schema, kv, entry) {
-        return await createTypedKvEntry(schema, kv, entry);
+        const result = await createTypedKvEntry(schema, kv, entry);
+        return result;
     }
     get key() {
-        return (0, helpers_js_1.decodeSubject)(this.entry.key);
+        return (0, helpers_ts_1.decodeSubject)(this.entry.key);
     }
     /**
      * Watch this KV entry for changes.
@@ -220,7 +242,7 @@ class TypedKVEntry {
                     if (opts?.includeDeletes) {
                         callback({
                             type: "delete",
-                            key: (0, helpers_js_1.decodeSubject)(entry.key),
+                            key: (0, helpers_ts_1.decodeSubject)(entry.key),
                             revision: entry.revision,
                             timestamp: entry.created,
                         });
@@ -245,7 +267,7 @@ class TypedKVEntry {
                     }
                     callback({
                         type: "update",
-                        key: (0, helpers_js_1.decodeSubject)(entry.key),
+                        key: (0, helpers_ts_1.decodeSubject)(entry.key),
                         value: validated,
                         revision: entry.revision,
                         timestamp: entry.created,
@@ -259,33 +281,28 @@ class TypedKVEntry {
         };
     }
     async merge(value, vcc) {
-        // @ts-expect-error svelte-check hits excessive type instantiation here
-        const mergedData = (0, ts_deepmerge_1.merge)(this.value, value);
-        const schema = this.schema;
-        const mergedRawValue = mergedData;
-        // @ts-expect-error svelte-check hits excessive type instantiation here
-        const mergeResult = trellis_result_1.Result.try(() => serializeExternalValue(schema, mergedRawValue));
+        const mergedData = mergeUnknown(__classPrivateFieldGet(this, _TypedKVEntry_value, "f"), value);
+        const mergeResult = result_1.Result.try(() => serializeExternalValue(this.schema, mergedData));
         if (mergeResult.isErr()) {
             const cause = mergeResult.error.cause;
             if (cause instanceof value_1.ParseError) {
-                const errors = value_1.default.Errors(schema, externalizeValue(mergedData));
-                return trellis_result_1.Result.err(new index_js_1.ValidationError({ errors, cause }));
+                const errors = value_1.default.Errors(this.schema, externalizeValue(mergedData));
+                return result_1.Result.err(new index_ts_1.ValidationError({ errors, cause }));
             }
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "merge", cause: mergeResult.error, context: { key: this.key } }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "merge", cause: mergeResult.error, context: { key: this.key } }));
         }
         return this.put(mergedData, vcc);
     }
     async put(value, vcc) {
-        const schema = this.schema;
-        const serialized = serializeValue(schema, value);
+        const serialized = serializeValue(this.schema, value);
         try {
             await this.kv.put(this.entry.key, serialized, {
                 previousSeq: vcc ? this.entry.revision : undefined,
             });
-            return trellis_result_1.Result.ok(undefined);
+            return result_1.Result.ok(undefined);
         }
         catch (cause) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "put", cause, context: { key: this.key } }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "put", cause, context: { key: this.key } }));
         }
     }
     async delete(vcc) {
@@ -293,14 +310,15 @@ class TypedKVEntry {
             await this.kv.delete(this.entry.key, {
                 previousSeq: vcc ? this.entry.revision : undefined,
             });
-            return trellis_result_1.Result.ok(undefined);
+            return result_1.Result.ok(undefined);
         }
         catch (cause) {
-            return trellis_result_1.Result.err(new index_js_1.KVError({ operation: "delete", cause, context: { key: this.key } }));
+            return result_1.Result.err(new index_ts_1.KVError({ operation: "delete", cause, context: { key: this.key } }));
         }
     }
 }
 exports.TypedKVEntry = TypedKVEntry;
+_TypedKVEntry_value = new WeakMap();
 async function createTypedKvEntry(schema, kv, entry) {
     async function deleteInvalidEntry(reason) {
         try {
@@ -308,7 +326,7 @@ async function createTypedKvEntry(schema, kv, entry) {
                 previousSeq: entry.revision,
             });
             return {
-                key: (0, helpers_js_1.decodeSubject)(entry.key),
+                key: (0, helpers_ts_1.decodeSubject)(entry.key),
                 revision: entry.revision,
                 invalidEntryDeleted: true,
                 invalidEntryReason: reason,
@@ -316,7 +334,7 @@ async function createTypedKvEntry(schema, kv, entry) {
         }
         catch (cause) {
             return {
-                key: (0, helpers_js_1.decodeSubject)(entry.key),
+                key: (0, helpers_ts_1.decodeSubject)(entry.key),
                 revision: entry.revision,
                 invalidEntryDeleted: false,
                 invalidEntryDeleteError: cause instanceof Error ? cause.message : String(cause),
@@ -324,31 +342,36 @@ async function createTypedKvEntry(schema, kv, entry) {
             };
         }
     }
-    const jsonResult = trellis_result_1.Result.try(() => entry.json());
+    const jsonResult = result_1.Result.try(() => entry.json());
     if (jsonResult.isErr()) {
         const context = await deleteInvalidEntry(`decode failed: ${jsonResult.error.message}`);
-        return trellis_result_1.Result.err(new index_js_1.ValidationError({
+        return result_1.Result.err(new index_ts_1.ValidationError({
             errors: [{ path: "", message: `Failed to decode KV value: ${jsonResult.error.message}` }],
             cause: jsonResult.error,
             context,
         }));
     }
     const json = jsonResult.take();
-    const parseResult = trellis_result_1.Result.try(() => parseExternalValue(schema, json));
+    const parseResult = result_1.Result.try(() => {
+        if (value_1.default.HasCodec(schema)) {
+            return value_1.default.Decode(schema, json);
+        }
+        return value_1.default.Parse(schema, json);
+    });
     if (parseResult.isErr()) {
         const cause = parseResult.error.cause;
         if (cause instanceof value_1.ParseError) {
             const errors = value_1.default.Errors(schema, json);
             const context = await deleteInvalidEntry("schema parse failed");
-            return trellis_result_1.Result.err(new index_js_1.ValidationError({ errors, cause, context }));
+            return result_1.Result.err(new index_ts_1.ValidationError({ errors, cause, context }));
         }
         const context = await deleteInvalidEntry(parseResult.error.message);
-        return trellis_result_1.Result.err(new index_js_1.ValidationError({
+        return result_1.Result.err(new index_ts_1.ValidationError({
             errors: [{ path: "", message: parseResult.error.message }],
             cause: parseResult.error,
             context,
         }));
     }
     const typedEntry = new TypedKVEntry(schema, kv, entry, parseResult.take());
-    return trellis_result_1.Result.ok(typedEntry);
+    return result_1.Result.ok(typedEntry);
 }

package/script/trellis/models/trellis/TrellisError.d.ts

@@ -24,7 +24,7 @@ export declare const TrellisErrorDataSchema: Type.TUnion<[Type.TObject<{
     id: Type.TString;
     type: Type.TLiteral<"AuthError">;
     message: Type.TString;
-    reason: Type.TUnion<[Type.TLiteral<"invalid_request">, Type.TLiteral<"missing_session_key">, Type.TLiteral<"missing_proof">, Type.TLiteral<"session_not_found">, Type.TLiteral<"session_expired">, Type.TLiteral<"invalid_signature">, Type.TLiteral<"user_not_found">, Type.TLiteral<"user_inactive">, Type.TLiteral<"unknown_service">, Type.TLiteral<"service_disabled">, Type.TLiteral<"iat_out_of_range">, Type.TLiteral<"invalid_binding_token">, Type.TLiteral<"session_corrupted">, Type.TLiteral<"session_already_bound">, Type.TLiteral<"authtoken_already_used">, Type.TLiteral<"oauth_session_key_mismatch">, Type.TLiteral<"service_role_on_user">, Type.TLiteral<"reply_subject_mismatch">, Type.TLiteral<"insufficient_permissions">, Type.TLiteral<"forbidden">]>;
+    reason: Type.TUnion<[Type.TLiteral<"invalid_request">, Type.TLiteral<"missing_session_key">, Type.TLiteral<"missing_proof">, Type.TLiteral<"session_not_found">, Type.TLiteral<"session_expired">, Type.TLiteral<"invalid_signature">, Type.TLiteral<"user_not_found">, Type.TLiteral<"user_inactive">, Type.TLiteral<"unknown_workload">, Type.TLiteral<"workload_profile_not_found">, Type.TLiteral<"workload_profile_disabled">, Type.TLiteral<"workload_activation_revoked">, Type.TLiteral<"unknown_service">, Type.TLiteral<"service_disabled">, Type.TLiteral<"iat_out_of_range">, Type.TLiteral<"invalid_binding_token">, Type.TLiteral<"session_corrupted">, Type.TLiteral<"session_already_bound">, Type.TLiteral<"authtoken_already_used">, Type.TLiteral<"oauth_session_key_mismatch">, Type.TLiteral<"service_role_on_user">, Type.TLiteral<"reply_subject_mismatch">, Type.TLiteral<"insufficient_permissions">, Type.TLiteral<"forbidden">, Type.TLiteral<"missing_handoff_id">, Type.TLiteral<"missing_profile_id">, Type.TLiteral<"workload_activation_handoff_not_found">, Type.TLiteral<"workload_activation_handoff_expired">, Type.TLiteral<"workload_activation_rejected">, Type.TLiteral<"workload_identity_key_mismatch">, Type.TLiteral<"invalid_workload_qr_mac">]>;
     context: Type.TOptional<Type.TRecord<"^.*$", Type.TUnknown>>;
     traceId: Type.TOptional<Type.TString>;
 }>, Type.TObject<{

package/script/trellis/models/trellis/TrellisError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TrellisError.d.ts","sourceRoot":"","sources":["../../../../src/trellis/models/trellis/TrellisError.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAMlD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKjC,CAAC;AAEH;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"TrellisError.d.ts","sourceRoot":"","sources":["../../../../../models/trellis/TrellisError.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAMlD;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKjC,CAAC;AAEH;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,sBAAsB,CAAC,CAAC"}

package/script/trellis/models/trellis/TrellisError.js

@@ -5,18 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrellisErrorDataSchema = void 0;
 const typebox_1 = __importDefault(require("typebox"));
-const mod_js_1 = require("@qlever-llc/trellis-result");
-const ValidationError_js_1 = require("../../errors/ValidationError.js");
-const AuthError_js_1 = require("../../errors/AuthError.js");
-const KVError_js_1 = require("../../errors/KVError.js");
+const mod_ts_1 = require("../../../result/mod.ts");
+const ValidationError_ts_1 = require("../../errors/ValidationError.ts");
+const AuthError_ts_1 = require("../../errors/AuthError.ts");
+const KVError_ts_1 = require("../../errors/KVError.ts");
 /**
  * Discriminated union schema for all possible Trellis error types.
  * These errors can be serialized and sent over RPC.
  * Note: RemoteError is not included here as it's a local wrapper, not a serializable error type.
  */
 exports.TrellisErrorDataSchema = typebox_1.default.Union([
-    mod_js_1.UnexpectedErrorDataSchema,
-    ValidationError_js_1.ValidationErrorDataSchema,
-    AuthError_js_1.AuthErrorDataSchema,
-    KVError_js_1.KVErrorDataSchema,
+    mod_ts_1.UnexpectedErrorDataSchema,
+    ValidationError_ts_1.ValidationErrorDataSchema,
+    AuthError_ts_1.AuthErrorDataSchema,
+    KVError_ts_1.KVErrorDataSchema,
 ]);

package/script/trellis/operations.d.ts

@@ -0,0 +1,81 @@
+import type { InferSchemaType } from "./contracts.ts";
+import { type Result } from "@qlever-llc/result";
+import type { JsonValue } from "./codec.ts";
+import { UnexpectedError } from "./errors/index.ts";
+export type OperationState = "pending" | "running" | "completed" | "failed" | "cancelled";
+export type OperationRefData = {
+    id: string;
+    service: string;
+    operation: string;
+};
+export type OperationSnapshot<TProgress = unknown, TOutput = unknown> = {
+    id: string;
+    service: string;
+    operation: string;
+    revision: number;
+    state: OperationState;
+    createdAt: string;
+    updatedAt: string;
+    completedAt?: string;
+    progress?: TProgress;
+    output?: TOutput;
+    error?: {
+        type: string;
+        message: string;
+    };
+};
+export type TerminalOperation<TProgress = unknown, TOutput = unknown> = OperationSnapshot<TProgress, TOutput> & {
+    state: "completed" | "failed" | "cancelled";
+};
+export type OperationEvent<TProgress = unknown, TOutput = unknown> = {
+    type: "accepted";
+    snapshot: OperationSnapshot<TProgress, TOutput>;
+} | {
+    type: "started";
+    snapshot: OperationSnapshot<TProgress, TOutput>;
+} | {
+    type: "progress";
+    snapshot: OperationSnapshot<TProgress, TOutput>;
+} | {
+    type: "completed";
+    snapshot: TerminalOperation<TProgress, TOutput>;
+} | {
+    type: "failed";
+    snapshot: TerminalOperation<TProgress, TOutput>;
+} | {
+    type: "cancelled";
+    snapshot: TerminalOperation<TProgress, TOutput>;
+};
+type OperationShape = {
+    subject: string;
+    input: unknown;
+    progress?: unknown;
+    output?: unknown;
+    cancel?: boolean;
+};
+type OperationInputOf<TDesc extends OperationShape> = InferSchemaType<TDesc["input"]>;
+type OperationProgressOf<TDesc extends OperationShape> = TDesc["progress"] extends undefined ? unknown : InferSchemaType<NonNullable<TDesc["progress"]>>;
+type OperationOutputOf<TDesc extends OperationShape> = TDesc["output"] extends undefined ? unknown : InferSchemaType<NonNullable<TDesc["output"]>>;
+export interface OperationTransport {
+    requestJson(subject: string, body: JsonValue): Promise<Result<JsonValue, UnexpectedError>>;
+    watchJson(subject: string, body: JsonValue): Promise<Result<AsyncIterable<Result<JsonValue, UnexpectedError>>, UnexpectedError>>;
+}
+export declare function controlSubject(subject: string): string;
+export declare class OperationRef<TDesc extends OperationShape, TProgress = OperationProgressOf<TDesc>, TOutput = OperationOutputOf<TDesc>> {
+    #private;
+    readonly id: string;
+    readonly service: string;
+    readonly operation: string;
+    constructor(transport: OperationTransport, descriptor: TDesc, ref: OperationRefData);
+    get(): Promise<Result<OperationSnapshot<TProgress, TOutput>, UnexpectedError>>;
+    wait(): Promise<Result<TerminalOperation<TProgress, TOutput>, UnexpectedError>>;
+    cancel(): Promise<Result<OperationSnapshot<TProgress, TOutput>, UnexpectedError>>;
+    watch(): Promise<Result<AsyncIterable<OperationEvent<TProgress, TOutput>>, UnexpectedError>>;
+}
+export declare class OperationInvoker<TDesc extends OperationShape, TInput = OperationInputOf<TDesc>, TProgress = OperationProgressOf<TDesc>, TOutput = OperationOutputOf<TDesc>> {
+    #private;
+    constructor(transport: OperationTransport, descriptor: TDesc);
+    start(input: TInput): Promise<Result<OperationRef<TDesc, TProgress, TOutput>, UnexpectedError>>;
+}
+export {};
+//# sourceMappingURL=operations.d.ts.map

package/script/trellis/operations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../../operations.ts"],"names":[],"mappings":"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"}