liminal 0.5.13 → 0.5.14

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # liminal
 
+## 0.5.14
+
+### Patch Changes
+
+- d12049c: Fix L.run return type. Add L.<type> for JSON-schema building.
+
 ## 0.5.13
 
 ### Patch Changes

package/L/L.ts

@@ -9,6 +9,16 @@ export * from "./message.ts"
 export * from "./model.ts"
 export * from "./reflect.ts"
 export * from "./run.ts"
+export * from "./schema/anyOf.ts"
+export * from "./schema/array.ts"
+export * from "./schema/boolean.ts"
+export * from "./schema/const.ts"
+export * from "./schema/enum.ts"
+export * from "./schema/integer.ts"
+export * from "./schema/null.ts"
+export * from "./schema/number"
+export * from "./schema/object.ts"
+export * from "./schema/string.ts"
 export * from "./strand.ts"
 export * from "./stream.ts"
 export * from "./system.ts"

package/L/assistant.ts

@@ -1,7 +1,6 @@
 import type { LEvent } from "../LEvent.ts"
 import type { Rune } from "../Rune.ts"
 import { Schema } from "../Schema.ts"
-import { continuation } from "./continuation.ts"
 import { infer } from "./infer.ts"
 import { message } from "./message.ts"
 
@@ -13,8 +12,7 @@ export const assistant: assistant = Object.assign(
   function* assistant<T>(schema: Schema<T>): Generator<Rune<LEvent>, T> {
     const inference = yield* infer(schema)
     yield* message("assistant", [{ part: inference }])
-    const input = JSON.parse(inference)
-    return yield* continuation("validate_assistant_message", () => Schema.validateValue(schema, input))
+    return JSON.parse(inference)
   },
   {
     *[Symbol.iterator]() {

package/L/infer.ts

@@ -15,11 +15,11 @@ export function* infer(schema?: Schema): Generator<Rune<LEvent>, string> {
   let inference = yield* continuation("infer", () =>
     model.seal({
       messages,
-      schema: schema
-        ? schema.type === "object"
+      ...schema && {
+        schema: schema.type === "object"
           ? schema
-          : Schema.wrap(schema)
-        : undefined,
+          : Schema.wrap(schema),
+      },
       signal,
     }).resolve())
   if (schema?.type && schema.type !== "object") {

package/L/message.ts

@@ -1,12 +1,12 @@
 import { LEvent, MessageAppended } from "../LEvent.ts"
-import type { ContentPart, Message, MessageRole } from "../Message.ts"
+import type { Content, Message, MessageRole } from "../Message.ts"
 import type { Rune } from "../Rune.ts"
 import { emit } from "./emit.ts"
 import { reflect } from "./reflect.ts"
 
-export function* message(role: MessageRole, content: Array<ContentPart>): Generator<Rune<LEvent>, void> {
+export function* message(role: MessageRole, content: Array<Content>): Generator<Rune<LEvent>, void> {
   const { context: { messages } } = yield* reflect
-  const message: Message = { role, content }
+  const message: Message = { role, parts: content }
   yield* emit(new MessageAppended(message))
   messages.push(message)
 }

package/L/run.ts

@@ -15,7 +15,7 @@ export interface RunConfig<Y extends Rune<any>> {
   signal?: AbortSignal | undefined
 }
 
-export function run<Y extends Rune<any>, T>(definition: Definition<Y, T>, config?: RunConfig<Y>): Strand {
+export function run<Y extends Rune<any>, T>(definition: Definition<Y, T>, config?: RunConfig<Y>): Strand<Y, T> {
   const context = Context({
     handler: config?.handler,
     models: config?.models ?? new ModelRegistry(),

package/L/schema/_schema_common.ts

@@ -0,0 +1,29 @@
+import type { Schema } from "../../Schema.ts"
+import { isTemplateStringsArray } from "../../util/isTemplateStringsArray.ts"
+
+export function make<S extends Schema>(schema: Omit<S, "T">, description?: string): S & TypeBase {
+  const schema_ = {
+    ...schema,
+    ...description && { description },
+  }
+
+  const Type = Object.assign(function describe(e0?: TemplateStringsArray | string, ...rest: Array<string>) {
+    const junction = isTemplateStringsArray(e0) ? String.raw(e0, ...rest) : e0
+    return make(
+      schema_,
+      description ? `${description}${junction ? `\n\n${junction}` : ""}` : junction,
+    )
+  }, schema_)
+  Object.defineProperty(Type, "toJSON", {
+    value() {
+      return schema_
+    },
+    enumerable: false,
+  })
+  return Type as never
+}
+
+export interface TypeBase {
+  (template: TemplateStringsArray, ...substitutions: Array<string>): this
+  (...values: Array<string>): this
+}

package/L/schema/anyOf.ts

@@ -0,0 +1,10 @@
+import type { Schema, SchemaAnyOf } from "../../Schema.ts"
+import { make } from "./_schema_common.ts"
+
+export interface anyOf<XA extends Array<Schema> = Array<Schema>> extends SchemaAnyOf<XA[number]["T"]> {
+  anyOf: XA
+}
+
+export function anyOf<XA extends Array<Schema>>(anyOf: XA): anyOf<XA> {
+  return make({ anyOf })
+}

package/L/schema/array.ts

@@ -0,0 +1,13 @@
+import type { Schema, SchemaArray } from "../../Schema.ts"
+import { make } from "./_schema_common.ts"
+
+export interface LArray<X extends Schema = Schema> extends SchemaArray<Array<X["T"]>> {
+  items: X
+}
+
+export function array<X extends Schema>(items: X): LArray<X> {
+  return make({
+    type: "array",
+    items,
+  })
+}

package/L/schema/boolean.ts

@@ -0,0 +1,8 @@
+import type { SchemaBoolean } from "../../Schema.ts"
+import { make, type TypeBase } from "./_schema_common.ts"
+
+interface boolean_ extends SchemaBoolean<boolean>, TypeBase {}
+
+const boolean_: boolean_ = make({ type: "boolean" })
+
+export { boolean_ as boolean }

package/L/schema/const.ts

@@ -0,0 +1,18 @@
+import type { SchemaString } from "../../Schema.ts"
+import { make, type TypeBase } from "./_schema_common.ts"
+
+interface const_<K extends string> extends SchemaString<K>, TypeBase {
+  enum?: never
+  const: K
+}
+
+function const_<K extends string>(value: K): const_<K> {
+  return make({
+    type: "string",
+    const: value,
+  })
+}
+
+Object.defineProperty(const_, "name", { value: "const" })
+
+export { const_ as const }

package/L/schema/enum.ts

@@ -0,0 +1,18 @@
+import type { SchemaString } from "../../Schema.ts"
+import { make, type TypeBase } from "./_schema_common.ts"
+
+interface enum_<V extends Array<string> = Array<string>> extends SchemaString<V[number]>, TypeBase {
+  enum: V
+  const?: never
+}
+
+function enum_<const V extends Array<string>>(...values: V): enum_<V> {
+  return make({
+    type: "string",
+    enum: values,
+  })
+}
+
+Object.defineProperty(enum_, "name", { value: "enum" })
+
+export { enum_ as enum }

package/L/schema/integer.ts

@@ -0,0 +1,6 @@
+import type { SchemaInteger } from "../../Schema.ts"
+import { make, type TypeBase } from "./_schema_common.ts"
+
+export interface integer extends SchemaInteger<number>, TypeBase {}
+
+export const integer: integer = make({ type: "integer" })

package/L/schema/null.ts

@@ -0,0 +1,8 @@
+import type { SchemaNull } from "../../Schema.ts"
+import { make, type TypeBase } from "./_schema_common.ts"
+
+export interface null_ extends SchemaNull<null>, TypeBase {}
+
+const null_: null_ = make({ type: "null" })
+
+export { null_ as null }

package/L/schema/number.ts

@@ -0,0 +1,8 @@
+import type { SchemaNumber } from "../../Schema.ts"
+import { make, type TypeBase } from "./_schema_common.ts"
+
+interface number_ extends SchemaNumber<number>, TypeBase {}
+
+const number_: number_ = make({ type: "number" })
+
+export { number_ as number }

package/L/schema/object.ts

@@ -0,0 +1,21 @@
+import type { Schema, SchemaObject } from "../../Schema.ts"
+import { make } from "./_schema_common.ts"
+
+interface object_<F extends Record<string, Schema> = Record<string, Schema>>
+  extends SchemaObject<{ [K in keyof F]: F[K]["T"] }>
+{
+  properties: F
+  required: Array<Extract<keyof F, string>>
+}
+
+function object_<XR extends Record<string, Schema>>(properties: XR): object_<XR> {
+  return make({
+    type: "object",
+    properties,
+    additionalProperties: false,
+    required: Object.keys(properties) as never,
+  })
+}
+
+Object.defineProperty(object_, "name", { value: "object" })
+export { object_ as object }

package/L/schema/string.ts

@@ -0,0 +1,11 @@
+import type { SchemaString } from "../../Schema.ts"
+import { make, type TypeBase } from "./_schema_common.ts"
+
+interface string_ extends SchemaString<string>, TypeBase {
+  enum?: never
+  const?: never
+}
+
+const string_: string_ = make({ type: "string" })
+
+export { string_ as string }

package/Message.ts

@@ -1,13 +1,14 @@
 export interface Message {
   readonly role: MessageRole
-  readonly content: Array<ContentPart>
+  readonly parts: Array<Content>
 }
 
 export type MessageRole = "system" | "user" | "assistant"
 
-export type ContentPart = {
+export type Content = {
   readonly part: string
   readonly alt?: never
+  readonly mime?: never
 } | {
   readonly part: URL
   readonly alt: string

package/Schema.ts

@@ -55,14 +55,14 @@ export interface SchemaBase<T> {
 export namespace Schema {
   const ids = new WeakMap<Schema, Record<string, string>>()
   const schemas = new WeakMap<WeakKey, Schema>()
-  const validators = new WeakMap<Schema, (value: unknown) => Promise<unknown>>()
+  const validators = new WeakMap<Schema, (value: unknown) => unknown>()
 
   export function compile<T>(key: WeakKey, {
     schema: schema_,
     validate,
   }: {
     schema(): unknown
-    validate(value: unknown): Promise<T>
+    validate(value: unknown): T
   }) {
     let schema = schemas.get(key)
     if (!schema) {
@@ -73,10 +73,10 @@ export namespace Schema {
     return schema
   }
 
-  export async function validateValue<T>(schema: Schema<T>, value: unknown): Promise<T> {
+  export function validateValue<T>(schema: Schema<T>, value: unknown): T {
     const validator = validators.get(schema)
     LE.assert(validator)
-    return await validator(value) as never
+    return validator(value) as never
   }
 
   export async function id(schema: Schema, description?: string): Promise<string> {

package/dist/L/L.d.ts

@@ -9,6 +9,16 @@ export * from "./message.ts";
 export * from "./model.ts";
 export * from "./reflect.ts";
 export * from "./run.ts";
+export * from "./schema/anyOf.ts";
+export * from "./schema/array.ts";
+export * from "./schema/boolean.ts";
+export * from "./schema/const.ts";
+export * from "./schema/enum.ts";
+export * from "./schema/integer.ts";
+export * from "./schema/null.ts";
+export * from "./schema/number";
+export * from "./schema/object.ts";
+export * from "./schema/string.ts";
 export * from "./strand.ts";
 export * from "./stream.ts";
 export * from "./system.ts";

package/dist/L/L.js

@@ -9,6 +9,16 @@ export * from "./message.js";
 export * from "./model.js";
 export * from "./reflect.js";
 export * from "./run.js";
+export * from "./schema/anyOf.js";
+export * from "./schema/array.js";
+export * from "./schema/boolean.js";
+export * from "./schema/const.js";
+export * from "./schema/enum.js";
+export * from "./schema/integer.js";
+export * from "./schema/null.js";
+export * from "./schema/number";
+export * from "./schema/object.js";
+export * from "./schema/string.js";
 export * from "./strand.js";
 export * from "./stream.js";
 export * from "./system.js";

package/dist/L/L.js.map

@@ -1 +1 @@
-{"version":3,"file":"L.js","sourceRoot":"","sources":["../../L/L.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"L.js","sourceRoot":"","sources":["../../L/L.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA;AACnC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}

package/dist/L/assistant.js

@@ -1,12 +1,10 @@
 import { Schema } from "../Schema.js";
-import { continuation } from "./continuation.js";
 import { infer } from "./infer.js";
 import { message } from "./message.js";
 export const assistant = Object.assign(function* assistant(schema) {
     const inference = yield* infer(schema);
     yield* message("assistant", [{ part: inference }]);
-    const input = JSON.parse(inference);
-    return yield* continuation("validate_assistant_message", () => Schema.validateValue(schema, input));
+    return JSON.parse(inference);
 }, {
     *[Symbol.iterator]() {
         const inference = yield* infer();

package/dist/L/assistant.js.map

@@ -1 +1 @@
-{"version":3,"file":"assistant.js","sourceRoot":"","sources":["../../L/assistant.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAMtC,MAAM,CAAC,MAAM,SAAS,GAAc,MAAM,CAAC,MAAM,CAC/C,QAAQ,CAAC,CAAC,SAAS,CAAI,MAAiB;IACtC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACtC,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;IAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACnC,OAAO,KAAK,CAAC,CAAC,YAAY,CAAC,4BAA4B,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;AACrG,CAAC,EACD;IACE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAA;QAChC,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QAClD,OAAO,SAAS,CAAA;IAClB,CAAC;CACF,CACF,CAAA"}
+{"version":3,"file":"assistant.js","sourceRoot":"","sources":["../../L/assistant.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAMtC,MAAM,CAAC,MAAM,SAAS,GAAc,MAAM,CAAC,MAAM,CAC/C,QAAQ,CAAC,CAAC,SAAS,CAAI,MAAiB;IACtC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACtC,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;IAClD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;AAC9B,CAAC,EACD;IACE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAA;QAChC,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;QAClD,OAAO,SAAS,CAAA;IAClB,CAAC;CACF,CACF,CAAA"}

package/dist/L/infer.js

@@ -12,11 +12,11 @@ export function* infer(schema) {
     yield* emit(new InferenceRequested(requestId, schema));
     let inference = yield* continuation("infer", () => model.seal({
         messages,
-        schema: schema
-            ? schema.type === "object"
+        ...schema && {
+            schema: schema.type === "object"
                 ? schema
-                : Schema.wrap(schema)
-            : undefined,
+                : Schema.wrap(schema),
+        },
         signal,
     }).resolve());
     if (schema?.type && schema.type !== "object") {

package/dist/L/infer.js.map

@@ -1 +1 @@
-{"version":3,"file":"infer.js","sourceRoot":"","sources":["../../L/infer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAe,MAAM,cAAc,CAAA;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,SAAS,CAAC,CAAC,KAAK,CAAC,MAAe;IACpC,MAAM,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;IAChE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAC3B,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,CAAA;IACrC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;IACtD,IAAI,SAAS,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,CAChD,KAAK,CAAC,IAAI,CAAC;QACT,QAAQ;QACR,MAAM,EAAE,MAAM;YACZ,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ;gBACxB,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YACvB,CAAC,CAAC,SAAS;QACb,MAAM;KACP,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;IACf,IAAI,MAAM,EAAE,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7C,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAA;IACzD,CAAC;IACD,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;IAC/C,OAAO,SAAS,CAAA;AAClB,CAAC"}
+{"version":3,"file":"infer.js","sourceRoot":"","sources":["../../L/infer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAe,MAAM,cAAc,CAAA;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,SAAS,CAAC,CAAC,KAAK,CAAC,MAAe;IACpC,MAAM,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;IAChE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;IAC3B,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,EAAE,CAAA;IACrC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;IACtD,IAAI,SAAS,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,CAChD,KAAK,CAAC,IAAI,CAAC;QACT,QAAQ;QACR,GAAG,MAAM,IAAI;YACX,MAAM,EAAE,MAAM,CAAC,IAAI,KAAK,QAAQ;gBAC9B,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SACxB;QACD,MAAM;KACP,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;IACf,IAAI,MAAM,EAAE,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7C,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAA;IACzD,CAAC;IACD,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;IAC/C,OAAO,SAAS,CAAA;AAClB,CAAC"}

package/dist/L/message.d.ts

@@ -1,4 +1,4 @@
 import { LEvent } from "../LEvent.ts";
-import type { ContentPart, MessageRole } from "../Message.ts";
+import type { Content, MessageRole } from "../Message.ts";
 import type { Rune } from "../Rune.ts";
-export declare function message(role: MessageRole, content: Array<ContentPart>): Generator<Rune<LEvent>, void>;
+export declare function message(role: MessageRole, content: Array<Content>): Generator<Rune<LEvent>, void>;

package/dist/L/message.js

@@ -3,7 +3,7 @@ import { emit } from "./emit.js";
 import { reflect } from "./reflect.js";
 export function* message(role, content) {
     const { context: { messages } } = yield* reflect;
-    const message = { role, content };
+    const message = { role, parts: content };
     yield* emit(new MessageAppended(message));
     messages.push(message);
 }

package/dist/L/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../L/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAGtD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,SAAS,CAAC,CAAC,OAAO,CAAC,IAAiB,EAAE,OAA2B;IACrE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;IAChD,MAAM,OAAO,GAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IAC1C,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;IACzC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACxB,CAAC"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../L/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAGtD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,SAAS,CAAC,CAAC,OAAO,CAAC,IAAiB,EAAE,OAAuB;IACjE,MAAM,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,OAAO,CAAA;IAChD,MAAM,OAAO,GAAY,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;IACjD,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;IACzC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;AACxB,CAAC"}

package/dist/L/run.d.ts

@@ -12,4 +12,4 @@ export interface RunConfig<Y extends Rune<any>> {
     tools?: Set<Tool> | undefined;
     signal?: AbortSignal | undefined;
 }
-export declare function run<Y extends Rune<any>, T>(definition: Definition<Y, T>, config?: RunConfig<Y>): Strand;
+export declare function run<Y extends Rune<any>, T>(definition: Definition<Y, T>, config?: RunConfig<Y>): Strand<Y, T>;

package/dist/L/schema/_schema_common.d.ts

@@ -0,0 +1,6 @@
+import type { Schema } from "../../Schema.ts";
+export declare function make<S extends Schema>(schema: Omit<S, "T">, description?: string): S & TypeBase;
+export interface TypeBase {
+    (template: TemplateStringsArray, ...substitutions: Array<string>): this;
+    (...values: Array<string>): this;
+}

package/dist/L/schema/_schema_common.js

@@ -0,0 +1,19 @@
+import { isTemplateStringsArray } from "../../util/isTemplateStringsArray.js";
+export function make(schema, description) {
+    const schema_ = {
+        ...schema,
+        ...description && { description },
+    };
+    const Type = Object.assign(function describe(e0, ...rest) {
+        const junction = isTemplateStringsArray(e0) ? String.raw(e0, ...rest) : e0;
+        return make(schema_, description ? `${description}${junction ? `\n\n${junction}` : ""}` : junction);
+    }, schema_);
+    Object.defineProperty(Type, "toJSON", {
+        value() {
+            return schema_;
+        },
+        enumerable: false,
+    });
+    return Type;
+}
+//# sourceMappingURL=_schema_common.js.map

package/dist/L/schema/_schema_common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_schema_common.js","sourceRoot":"","sources":["../../../L/schema/_schema_common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAA;AAE7E,MAAM,UAAU,IAAI,CAAmB,MAAoB,EAAE,WAAoB;IAC/E,MAAM,OAAO,GAAG;QACd,GAAG,MAAM;QACT,GAAG,WAAW,IAAI,EAAE,WAAW,EAAE;KAClC,CAAA;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,QAAQ,CAAC,EAAkC,EAAE,GAAG,IAAmB;QACrG,MAAM,QAAQ,GAAG,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAC1E,OAAO,IAAI,CACT,OAAO,EACP,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAC9E,CAAA;IACH,CAAC,EAAE,OAAO,CAAC,CAAA;IACX,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE;QACpC,KAAK;YACH,OAAO,OAAO,CAAA;QAChB,CAAC;QACD,UAAU,EAAE,KAAK;KAClB,CAAC,CAAA;IACF,OAAO,IAAa,CAAA;AACtB,CAAC"}

package/dist/L/schema/anyOf.d.ts

@@ -0,0 +1,5 @@
+import type { Schema, SchemaAnyOf } from "../../Schema.ts";
+export interface anyOf<XA extends Array<Schema> = Array<Schema>> extends SchemaAnyOf<XA[number]["T"]> {
+    anyOf: XA;
+}
+export declare function anyOf<XA extends Array<Schema>>(anyOf: XA): anyOf<XA>;

package/dist/L/schema/anyOf.js

@@ -0,0 +1,5 @@
+import { make } from "./_schema_common.js";
+export function anyOf(anyOf) {
+    return make({ anyOf });
+}
+//# sourceMappingURL=anyOf.js.map

package/dist/L/schema/anyOf.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"anyOf.js","sourceRoot":"","sources":["../../../L/schema/anyOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAM1C,MAAM,UAAU,KAAK,CAA2B,KAAS;IACvD,OAAO,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AACxB,CAAC"}

package/dist/L/schema/array.d.ts

@@ -0,0 +1,5 @@
+import type { Schema, SchemaArray } from "../../Schema.ts";
+export interface LArray<X extends Schema = Schema> extends SchemaArray<Array<X["T"]>> {
+    items: X;
+}
+export declare function array<X extends Schema>(items: X): LArray<X>;

package/dist/L/schema/array.js

@@ -0,0 +1,8 @@
+import { make } from "./_schema_common.js";
+export function array(items) {
+    return make({
+        type: "array",
+        items,
+    });
+}
+//# sourceMappingURL=array.js.map

package/dist/L/schema/array.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../L/schema/array.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAM1C,MAAM,UAAU,KAAK,CAAmB,KAAQ;IAC9C,OAAO,IAAI,CAAC;QACV,IAAI,EAAE,OAAO;QACb,KAAK;KACN,CAAC,CAAA;AACJ,CAAC"}

package/dist/L/schema/boolean.d.ts

@@ -0,0 +1,6 @@
+import type { SchemaBoolean } from "../../Schema.ts";
+import { type TypeBase } from "./_schema_common.ts";
+interface boolean_ extends SchemaBoolean<boolean>, TypeBase {
+}
+declare const boolean_: boolean_;
+export { boolean_ as boolean };

package/dist/L/schema/boolean.js

@@ -0,0 +1,4 @@
+import { make } from "./_schema_common.js";
+const boolean_ = make({ type: "boolean" });
+export { boolean_ as boolean };
+//# sourceMappingURL=boolean.js.map

package/dist/L/schema/boolean.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"boolean.js","sourceRoot":"","sources":["../../../L/schema/boolean.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAiB,MAAM,qBAAqB,CAAA;AAIzD,MAAM,QAAQ,GAAa,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;AAEpD,OAAO,EAAE,QAAQ,IAAI,OAAO,EAAE,CAAA"}

package/dist/L/schema/const.d.ts

@@ -0,0 +1,8 @@
+import type { SchemaString } from "../../Schema.ts";
+import { type TypeBase } from "./_schema_common.ts";
+interface const_<K extends string> extends SchemaString<K>, TypeBase {
+    enum?: never;
+    const: K;
+}
+declare function const_<K extends string>(value: K): const_<K>;
+export { const_ as const };

package/dist/L/schema/const.js

@@ -0,0 +1,10 @@
+import { make } from "./_schema_common.js";
+function const_(value) {
+    return make({
+        type: "string",
+        const: value,
+    });
+}
+Object.defineProperty(const_, "name", { value: "const" });
+export { const_ as const };
+//# sourceMappingURL=const.js.map

package/dist/L/schema/const.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"const.js","sourceRoot":"","sources":["../../../L/schema/const.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAiB,MAAM,qBAAqB,CAAA;AAOzD,SAAS,MAAM,CAAmB,KAAQ;IACxC,OAAO,IAAI,CAAC;QACV,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,KAAK;KACb,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;AAEzD,OAAO,EAAE,MAAM,IAAI,KAAK,EAAE,CAAA"}

package/dist/L/schema/enum.d.ts

@@ -0,0 +1,8 @@
+import type { SchemaString } from "../../Schema.ts";
+import { type TypeBase } from "./_schema_common.ts";
+interface enum_<V extends Array<string> = Array<string>> extends SchemaString<V[number]>, TypeBase {
+    enum: V;
+    const?: never;
+}
+declare function enum_<const V extends Array<string>>(...values: V): enum_<V>;
+export { enum_ as enum };

package/dist/L/schema/enum.js

@@ -0,0 +1,10 @@
+import { make } from "./_schema_common.js";
+function enum_(...values) {
+    return make({
+        type: "string",
+        enum: values,
+    });
+}
+Object.defineProperty(enum_, "name", { value: "enum" });
+export { enum_ as enum };
+//# sourceMappingURL=enum.js.map

package/dist/L/schema/enum.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../L/schema/enum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAiB,MAAM,qBAAqB,CAAA;AAOzD,SAAS,KAAK,CAAgC,GAAG,MAAS;IACxD,OAAO,IAAI,CAAC;QACV,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,MAAM;KACb,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;AAEvD,OAAO,EAAE,KAAK,IAAI,IAAI,EAAE,CAAA"}

package/dist/L/schema/integer.d.ts

@@ -0,0 +1,5 @@
+import type { SchemaInteger } from "../../Schema.ts";
+import { type TypeBase } from "./_schema_common.ts";
+export interface integer extends SchemaInteger<number>, TypeBase {
+}
+export declare const integer: integer;

package/dist/L/schema/integer.js

@@ -0,0 +1,3 @@
+import { make } from "./_schema_common.js";
+export const integer = make({ type: "integer" });
+//# sourceMappingURL=integer.js.map

package/dist/L/schema/integer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"integer.js","sourceRoot":"","sources":["../../../L/schema/integer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAiB,MAAM,qBAAqB,CAAA;AAIzD,MAAM,CAAC,MAAM,OAAO,GAAY,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA"}

package/dist/L/schema/null.d.ts

@@ -0,0 +1,6 @@
+import type { SchemaNull } from "../../Schema.ts";
+import { type TypeBase } from "./_schema_common.ts";
+export interface null_ extends SchemaNull<null>, TypeBase {
+}
+declare const null_: null_;
+export { null_ as null };

package/dist/L/schema/null.js

@@ -0,0 +1,4 @@
+import { make } from "./_schema_common.js";
+const null_ = make({ type: "null" });
+export { null_ as null };
+//# sourceMappingURL=null.js.map

package/dist/L/schema/null.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"null.js","sourceRoot":"","sources":["../../../L/schema/null.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAiB,MAAM,qBAAqB,CAAA;AAIzD,MAAM,KAAK,GAAU,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;AAE3C,OAAO,EAAE,KAAK,IAAI,IAAI,EAAE,CAAA"}

package/dist/L/schema/number.d.ts

@@ -0,0 +1,6 @@
+import type { SchemaNumber } from "../../Schema.ts";
+import { type TypeBase } from "./_schema_common.ts";
+interface number_ extends SchemaNumber<number>, TypeBase {
+}
+declare const number_: number_;
+export { number_ as number };

package/dist/L/schema/number.js

@@ -0,0 +1,4 @@
+import { make } from "./_schema_common.js";
+const number_ = make({ type: "number" });
+export { number_ as number };
+//# sourceMappingURL=number.js.map

package/dist/L/schema/number.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../L/schema/number.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAiB,MAAM,qBAAqB,CAAA;AAIzD,MAAM,OAAO,GAAY,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;AAEjD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,CAAA"}