structured-outputs 0.1.0-beta.21 → 0.1.0-beta.23

package/esm/types/std/Option.d.ts

@@ -1,7 +1,8 @@
+import { none } from "../primitives.js";
 import { taggedUnion } from "../taggedUnion.js";
 import type { Ty } from "../Ty.js";
-export declare function option<S extends Ty>(Some: S): ReturnType<typeof taggedUnion<{
+export declare function Option<S extends Ty>(Some: S): ReturnType<typeof taggedUnion<{
     Some: S;
-    None: Ty<null, never>;
+    None: typeof none;
 }>>;
 //# sourceMappingURL=Option.d.ts.map

package/esm/types/std/Option.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Option.d.ts","sourceRoot":"","sources":["../../../src/types/std/Option.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,UAAU,CAAA;AAElC,wBAAgB,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,UAAU,CACvD,OAAO,WAAW,CAAC;IACjB,IAAI,EAAE,CAAC,CAAA;IACP,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;CACtB,CAAC,CACH,CAKA"}
+{"version":3,"file":"Option.d.ts","sourceRoot":"","sources":["../../../src/types/std/Option.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,UAAU,CAAA;AAElC,wBAAgB,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,UAAU,CACvD,OAAO,WAAW,CAAC;IACjB,IAAI,EAAE,CAAC,CAAA;IACP,IAAI,EAAE,OAAO,IAAI,CAAA;CAClB,CAAC,CACH,CAKA"}

package/esm/types/std/Option.js

@@ -1,6 +1,6 @@
-import { none } from "../leaves.js";
+import { none } from "../primitives.js";
 import { taggedUnion } from "../taggedUnion.js";
-export function option(Some) {
+export function Option(Some) {
     return taggedUnion({
         Some,
         None: none,

package/esm/types/std/Option.js.map

@@ -1 +1 @@
-{"version":3,"file":"Option.js","sourceRoot":"","sources":["../../../src/types/std/Option.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,MAAM,UAAU,MAAM,CAAe,IAAO;IAM1C,OAAO,WAAW,CAAC;QACjB,IAAI;QACJ,IAAI,EAAE,IAAI;KACX,CAAC,CAAA,uCAAuC,CAAA;AAC3C,CAAC"}
+{"version":3,"file":"Option.js","sourceRoot":"","sources":["../../../src/types/std/Option.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,MAAM,UAAU,MAAM,CAAe,IAAO;IAM1C,OAAO,WAAW,CAAC;QACjB,IAAI;QACJ,IAAI,EAAE,IAAI;KACX,CAAC,CAAA,uCAAuC,CAAA;AAC3C,CAAC"}

package/esm/types/std/Wrapper.d.ts

@@ -1,6 +1,5 @@
 import type { Ty } from "../mod.js";
 import { object } from "../object.js";
-export type Wrapper<X extends Ty = Ty> = ReturnType<typeof Wrapper<X>>;
 export declare function Wrapper<X extends Ty>(value: X): ReturnType<typeof object<{
     value: X;
 }>>;

package/esm/types/std/Wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../../src/types/std/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;AAEtE,wBAAgB,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC,CAEvF"}
+{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../../src/types/std/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,wBAAgB,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC;IAAE,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC,CAEvF"}

package/esm/types/std/Wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../../src/types/std/Wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAIrC,MAAM,UAAU,OAAO,CAAe,KAAQ;IAC5C,OAAO,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AAC1B,CAAC"}
+{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../../src/types/std/Wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,MAAM,UAAU,OAAO,CAAe,KAAQ;IAC5C,OAAO,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;AAC1B,CAAC"}

package/esm/types/std/color.d.ts

@@ -0,0 +1,8 @@
+import type { Ty } from "../Ty.js";
+export declare const Rgb: Ty<{
+    r: number;
+    g: number;
+    b: number;
+}, never, true>;
+export declare const Hex: Ty<string, never, true>;
+//# sourceMappingURL=color.d.ts.map

package/esm/types/std/color.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../src/types/std/color.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,UAAU,CAAA;AAElC,eAAO,MAAM,GAAG,EAAE,EAAE,CAClB;IACE,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;CACV,EACD,KAAK,EACL,IAAI,CAKJ,CAAA;AAEF,eAAO,MAAM,GAAG,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAGvC,CAAA"}

package/esm/types/std/color.js

@@ -0,0 +1,13 @@
+import { object } from "../object.js";
+import { number } from "../primitives.js";
+import { transform } from "../transform.js";
+export const Rgb = object({
+    r: number `Between 0 and 255`,
+    g: number `Between 0 and 255`,
+    b: number `Between 0 and 255`,
+});
+export const Hex = transform(Rgb, ({ r, g, b }) => `${toHex(r)}${toHex(g)}${toHex(b)}"`);
+function toHex(value) {
+    return value.toString(16).padStart(2, "0");
+}
+//# sourceMappingURL=color.js.map

package/esm/types/std/color.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"color.js","sourceRoot":"","sources":["../../../src/types/std/color.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAG3C,MAAM,CAAC,MAAM,GAAG,GAQZ,MAAM,CAAC;IACT,CAAC,EAAE,MAAM,CAAA,mBAAmB;IAC5B,CAAC,EAAE,MAAM,CAAA,mBAAmB;IAC5B,CAAC,EAAE,MAAM,CAAA,mBAAmB;CAC7B,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,GAAG,GAA4B,SAAS,CACnD,GAAG,EACH,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CACtD,CAAA;AAED,SAAS,KAAK,CAAC,KAAa;IAC1B,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AAC5C,CAAC"}

package/esm/types/std/mod.d.ts

@@ -1,3 +1,5 @@
+export * from "./color.js";
+export * from "./Date.js";
 export * from "./Option.js";
 export * from "./Wrapper.js";
 //# sourceMappingURL=mod.d.ts.map

package/esm/types/std/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/types/std/mod.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../../src/types/std/mod.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA"}

package/esm/types/std/mod.js

@@ -1,3 +1,5 @@
+export * from "./color.js";
+export * from "./Date.js";
 export * from "./Option.js";
 export * from "./Wrapper.js";
 //# sourceMappingURL=mod.js.map

package/esm/types/std/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../../src/types/std/mod.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../../src/types/std/mod.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA"}

package/esm/types/taggedUnion.d.ts

@@ -2,7 +2,7 @@ import { Ty } from "./Ty.js";
 export declare function taggedUnion<M extends Record<string, Ty>>(members: M): Ty<{
     [K in keyof M]: {
         type: K;
-        value: M[K][Ty.T];
+        value: M[K]["T"];
     };
-}[keyof M], M[keyof M][Ty.P]>;
+}[keyof M], M[keyof M]["P"], false>;
 //# sourceMappingURL=taggedUnion.d.ts.map

package/esm/types/taggedUnion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"taggedUnion.d.ts","sourceRoot":"","sources":["../../src/types/taggedUnion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAE5B,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,CACvE;KACG,CAAC,IAAI,MAAM,CAAC,GAAG;QACd,IAAI,EAAE,CAAC,CAAA;QACP,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;KAClB;CACF,CAAC,MAAM,CAAC,CAAC,EACV,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CACjB,CAiBA"}
+{"version":3,"file":"taggedUnion.d.ts","sourceRoot":"","sources":["../../src/types/taggedUnion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,EAAE,EAAE,MAAM,SAAS,CAAA;AAEzC,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,CACvE;KACG,CAAC,IAAI,MAAM,CAAC,GAAG;QACd,IAAI,EAAE,CAAC,CAAA;QACP,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;KACjB;CACF,CAAC,MAAM,CAAC,CAAC,EACV,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EACf,KAAK,CACN,CAaA"}

package/esm/types/taggedUnion.js

@@ -1,20 +1,25 @@
 import { Ty } from "./Ty.js";
 export function taggedUnion(members) {
-    return Ty((description, ref) => ({
-        description,
-        discriminator: "type",
-        anyOf: Object.entries(members).map(([k, v]) => ({
-            type: "object",
-            properties: {
-                type: {
-                    type: "string",
-                    const: k,
-                },
-                value: ref(v),
+    const entries = Object.entries(members);
+    return Ty((subschema) => entries.length === 1
+        ? variant(entries[0][0], subschema(entries[0][1]))
+        : {
+            discriminator: "type",
+            anyOf: entries.map(([k, v]) => variant(k, subschema(v))),
+        }, false, (v) => members[v.type][""].transform(v));
+}
+function variant(type, value) {
+    return {
+        type: "object",
+        properties: {
+            type: {
+                type: "string",
+                const: type,
             },
-            required: ["type", "value"],
-            additionalProperties: false,
-        })),
-    }));
+            value,
+        },
+        required: ["type", "value"],
+        additionalProperties: false,
+    };
 }
 //# sourceMappingURL=taggedUnion.js.map

package/esm/types/taggedUnion.js.map

@@ -1 +1 @@
-{"version":3,"file":"taggedUnion.js","sourceRoot":"","sources":["../../src/types/taggedUnion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAE5B,MAAM,UAAU,WAAW,CAA+B,OAAU;IASlE,OAAO,EAAE,CAAC,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC/B,WAAW;QACX,aAAa,EAAE,MAAM;QACrB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9C,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,CAAC;iBACT;gBACD,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;aACd;YACD,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;YAC3B,oBAAoB,EAAE,KAAK;SAC5B,CAAC,CAAC;KACJ,CAAC,CAAC,CAAA;AACL,CAAC"}
+{"version":3,"file":"taggedUnion.js","sourceRoot":"","sources":["../../src/types/taggedUnion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,EAAE,EAAE,MAAM,SAAS,CAAA;AAEzC,MAAM,UAAU,WAAW,CAA+B,OAAU;IAUlE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IACvC,OAAO,EAAE,CACP,CAAC,SAAS,EAAE,EAAE,CACZ,OAAO,CAAC,MAAM,KAAK,CAAC;QAClB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC;YACA,aAAa,EAAE,MAAM;YACrB,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SACzD,EACL,KAAK,EACL,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAE,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CACzC,CAAA;AACH,CAAC;AAED,SAAS,OAAO,CAAC,IAAY,EAAE,KAAa;IAC1C,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,IAAI;aACZ;YACD,KAAK;SACN;QACD,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;QAC3B,oBAAoB,EAAE,KAAK;KAC5B,CAAA;AACH,CAAC"}

package/esm/types/transform.d.ts

@@ -0,0 +1,3 @@
+import { Ty } from "./Ty.js";
+export declare function transform<T, P extends keyof any, R extends boolean, I>(ty: Ty<I, P, R>, transform: (value: I) => T): Ty<T, P, R>;
+//# sourceMappingURL=transform.d.ts.map

package/esm/types/transform.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/types/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAE5B,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,EAAE,CAAC,SAAS,OAAO,EAAE,CAAC,EACpE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACf,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GACzB,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAEb"}

package/esm/types/transform.js

@@ -0,0 +1,5 @@
+import { Ty } from "./Ty.js";
+export function transform(ty, transform) {
+    return Ty((ref) => ref(ty), ty[""].root, (value) => transform(value));
+}
+//# sourceMappingURL=transform.js.map

package/esm/types/transform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../src/types/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAE5B,MAAM,UAAU,SAAS,CACvB,EAAe,EACf,SAA0B;IAE1B,OAAO,EAAE,CAAa,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;AACnF,CAAC"}

package/esm/types/tuple.d.ts

@@ -0,0 +1,5 @@
+import { Ty } from "./Ty.js";
+export declare function tuple<F extends Ty[]>(...elements: F): Ty<{
+    [K in keyof F]: F[K]["T"];
+}, F[number]["P"], true>;
+//# sourceMappingURL=tuple.d.ts.map

package/esm/types/tuple.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../../src/types/tuple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAE5B,wBAAgB,KAAK,CAAC,CAAC,SAAS,EAAE,EAAE,EAClC,GAAG,QAAQ,EAAE,CAAC,GACb,EAAE,CAAC;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;CAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAYzD"}

package/esm/types/tuple.js

@@ -0,0 +1,11 @@
+import { Ty } from "./Ty.js";
+export function tuple(...elements) {
+    const { length } = elements;
+    return Ty((ref) => ({
+        type: "object",
+        properties: Object.fromEntries(Array.from({ length }, (_0, i) => [i, ref(elements[i])])),
+        additionalProperties: false,
+        required: Object.keys(Array.from({ length }, (_0, i) => i)),
+    }), true, (v) => Array.from({ length }, (_0, i) => elements[i][""].transform(v[i])));
+}
+//# sourceMappingURL=tuple.js.map

package/esm/types/tuple.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tuple.js","sourceRoot":"","sources":["../../src/types/tuple.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAE5B,MAAM,UAAU,KAAK,CACnB,GAAG,QAAW;IAEd,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAA;IAC3B,OAAO,EAAE,CACP,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACR,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC;QACzF,oBAAoB,EAAE,KAAK;QAC3B,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;KAC5D,CAAC,EACF,IAAI,EACJ,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAU,CACpF,CAAA;AACH,CAAC"}

package/esm/util/recombine.d.ts

@@ -0,0 +1,2 @@
+export declare function recombine(strings: TemplateStringsArray, values: Array<number | string>): string;
+//# sourceMappingURL=recombine.d.ts.map

package/esm/util/recombine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recombine.d.ts","sourceRoot":"","sources":["../../src/util/recombine.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,MAAM,CAE/F"}

package/esm/util/recombine.js

@@ -0,0 +1,4 @@
+export function recombine(strings, values) {
+    return strings.reduce((acc, cur, i) => `${acc}${cur}${values[i] ?? ""}`, "");
+}
+//# sourceMappingURL=recombine.js.map

package/esm/util/recombine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recombine.js","sourceRoot":"","sources":["../../src/util/recombine.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS,CAAC,OAA6B,EAAE,MAA8B;IACrF,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;AAC9E,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "structured-outputs",
-  "version": "0.1.0-beta.21",
-  "description": "Compose OpenAI structured output schemas.",
+  "version": "0.1.0-beta.23",
+  "description": "A library for working with OpenAI's structured outputs.",
   "repository": "github:harrysolovay/structured-outputs.git",
   "license": "Apache-2.0",
   "main": "./esm/mod.js",

package/src/ResponseFormat.ts

@@ -1,25 +1,23 @@
-import type { RootTy } from "./types/mod.js"
-import { recombineTaggedTemplateArgs } from "./util/recombineTaggedTemplateArgs.js"
-import type { ChatCompletion, ChatCompletionChoice, JsonSchema } from "./oai.js"
+import type Openai from "openai"
+import type { Ty } from "./types/mod.js"
+import { recombine } from "./util/recombine.js"
 
 export interface ResponseFormat<T> {
   (template: TemplateStringsArray, ...quasis: Array<string>): ResponseFormat<T>
   type: "json_schema"
   /** The desired return type in JSON Schema. */
-  json_schema: JsonSchema
-  /** Parse the content of the first choice into a typed object. */
-  parseFirstChoice(completion: ChatCompletion): T
-  /** Parse all choice contents into an array of typed object. */
-  parseChoices(completion: ChatCompletion): Array<T>
+  json_schema: Openai.ResponseFormatJSONSchema["json_schema"]
+  /** Transform the content of the first choice into a typed object. */
+  into(completion: ChatCompletion): T
 }
 
-export function ResponseFormat<T>(name: string, ty: RootTy<T, never>): ResponseFormat<T> {
+export function ResponseFormat<T>(name: string, ty: Ty<T, never, true>): ResponseFormat<T> {
   return ResponseFormat_(name, ty)
 }
 
 function ResponseFormat_<T>(
   name: string,
-  ty: RootTy<T, never>,
+  ty: Ty<T, never>,
   description?: string,
 ): ResponseFormat<T> {
   return Object.assign(
@@ -27,7 +25,7 @@ function ResponseFormat_<T>(
       ResponseFormat_(
         name,
         ty,
-        description ? `${description} ${recombineTaggedTemplateArgs(template, quasis)}` : undefined,
+        description ? `${description} ${recombine(template, quasis)}` : undefined,
       ),
     {
       type: "json_schema" as const,
@@ -37,11 +35,8 @@ function ResponseFormat_<T>(
         schema: ty.schema(),
         strict: true,
       },
-      parseFirstChoice: (completion: ChatCompletion): T => {
-        return JSON.parse(ResponseFormat.unwrapFirstChoice(completion))
-      },
-      parseChoices: (completion: ChatCompletion): Array<T> => {
-        return ResponseFormat.unwrapChoices(completion).map((content) => JSON.parse(content))
+      into: (completion: ChatCompletion): T => {
+        return ty[""].transform(JSON.parse(ResponseFormat.unwrapFirstChoice(completion)))
       },
       toJSON() {
         const { type, json_schema } = this
@@ -64,7 +59,7 @@ export namespace ResponseFormat {
     return completions.choices.map(unwrapChoice)
   }
 
-  function unwrapChoice(choice: ChatCompletionChoice) {
+  function unwrapChoice(choice: Openai.Chat.Completions.ChatCompletion.Choice) {
     const { finish_reason, message } = choice
     if (finish_reason !== "stop") {
       throw new ResponseFormatUnwrapError(
@@ -87,3 +82,5 @@ export namespace ResponseFormat {
 export class ResponseFormatUnwrapError extends Error {
   override readonly name = "UnwrapResponseError"
 }
+
+type ChatCompletion = Openai.Chat.ChatCompletion

package/src/Tool.ts

@@ -1,17 +1,17 @@
-import type { RootTy, Schema } from "./types/mod.js"
-import { recombineTaggedTemplateArgs } from "./util/recombineTaggedTemplateArgs.js"
+import type { Schema, Ty } from "./types/mod.js"
+import { recombine } from "./util/recombine.js"
 
-export function Tool<T>(name: string, ty: RootTy<T, never>): Tool<T> {
+export function Tool<T>(name: string, ty: Ty<T, never, true>): Tool<T> {
   return Tool_(name, ty)
 }
 
-function Tool_<T>(name: string, ty: RootTy<T, never>, description?: string): Tool<T> {
+function Tool_<T>(name: string, ty: Ty<T, never, true>, description?: string): Tool<T> {
   return Object.assign(
     (template: TemplateStringsArray, ...quasis: Array<string>) =>
       Tool_(
         name,
         ty,
-        description ? `${description} ${recombineTaggedTemplateArgs(template, quasis)}` : undefined,
+        description ? `${description} ${recombine(template, quasis)}` : undefined,
       ),
     {
       type: "function" as const,

package/src/types/Ty.ts

@@ -1,57 +1,91 @@
-import type { Ref } from "./Ref.js"
-import { phantoms } from "../util/phantoms.js"
-import type { RootTy } from "./RootTy.js"
+import { recombine } from "../util/recombine.js"
 
-export function Ty<T, P extends string = never>(
-  toSchema: ToSchema,
-  descriptions: Array<Description> = [],
+export interface Ty<T = any, P extends keyof any = keyof any, R extends boolean = boolean> {
+  <P2 extends Array<keyof any>>(
+    template: TemplateStringsArray,
+    ...placeheld: P2
+  ): Ty<T, P | P2[number], R>
+
+  /** The native TypeScript type. The runtime value is nonexistent. */
+  T: T
+  /** The literal types of the placeheld keys. The runtime value is nonexistent. */
+  P: P
+
+  "": {
+    subschema: Subschema
+    root: R
+    transform: (value: any) => any
+    context: Array<Context>
+    applied: Applied
+  }
+
+  /** Inject context into that which is placeheld. */
+  fill: <A extends Partial<Record<P, number | string>>>(
+    values: A,
+  ) => Ty<T, Exclude<P, keyof A>, R>
+
+  /** Get the corresponding JSON Schema. */
+  schema(this: Ty<T, never>): Schema
+}
+
+export function Ty<T, P extends keyof any, R extends boolean, I = T>(
+  subschema: Subschema,
+  root: R,
+  transform: (value: I) => T = (value) => value as never,
+  context: Array<Context> = [],
   applied: Applied = {},
-): Ty<T, P> {
+): Ty<T, P, R> {
   return Object.assign(
-    <P2 extends Array<string>>(template: TemplateStringsArray, ...placeheld: P2) =>
-      Ty<T, P | P2[number]>(toSchema, [{ template, placeheld }, ...descriptions], applied),
-    phantoms<{ [Ty.T]: T; [Ty.P]: P }>(),
+    <P2 extends Array<keyof any>>(template: TemplateStringsArray, ...placeheld: P2) =>
+      Ty<T, P | P2[number], R, I>(
+        subschema,
+        root,
+        transform,
+        [{ template, placeheld }, ...context],
+        applied,
+      ),
+    {} as { T: T; P: P },
     {
-      toSchema,
-      descriptions,
-      applied,
-      apply: <A extends Partial<Record<P, string | number>>>(values: A) => {
-        return Ty<T, Exclude<P, keyof A>>(toSchema, descriptions, { ...applied, ...values })
+      "": {
+        subschema,
+        root,
+        transform,
+        context,
+        applied,
       },
-      isRoot(): this is RootTy {
-        return false
+      fill: <A extends Partial<Record<P, string | number>>>(values: A) => {
+        return Ty<T, Exclude<P, keyof A>, R, I>(subschema, root, transform, context, {
+          ...applied,
+          ...values,
+        })
+      },
+      schema(this: Ty<T, never>) {
+        return SubschemaFactory({})(this)
       },
     },
   )
 }
 
-export interface Ty<T = any, P extends string = string> {
-  <P2 extends Array<string>>(
-    template: TemplateStringsArray,
-    ...placeheld: P2
-  ): Ty<T, P | P2[number]>
-  [Ty.T]: T
-  [Ty.P]: P
-  toSchema: ToSchema
-  descriptions: Array<Description>
-  applied: Applied
-  apply: <A extends Partial<Record<P, number | string>>>(values: A) => Ty<T, Exclude<P, keyof A>>
-  isRoot(): this is RootTy
-}
+export type Subschema = (subschema: SubschemaFactory) => Schema
 
-export namespace Ty {
-  export type T = typeof T
-  export declare const T: unique symbol
-  export type P = typeof P
-  export declare const P: unique symbol
+export type SubschemaFactory = (ty: Ty) => Schema
+export function SubschemaFactory(applied: Applied): SubschemaFactory {
+  return (ty) => {
+    applied = { ...applied, ...ty[""].applied }
+    const description = ty[""].context
+      .map(({ template, placeheld }) => recombine(template, placeheld.map((k) => applied[k]!)))
+      .join(" ")
+    return {
+      ...ty[""].subschema(SubschemaFactory(applied)),
+      ...description ? { description } : {},
+    }
+  }
 }
 
-export type ToSchema = (description: string | undefined, ref: Ref) => Schema
-export type Schema = Record<string, unknown>
-
-export interface Description {
+interface Context {
   template: TemplateStringsArray
-  placeheld: Array<string>
+  placeheld: Array<keyof any>
 }
+type Applied = Record<keyof any, number | string>
 
-export type Applied = Record<string, number | string>
+export type Schema = Record<string, unknown>

package/src/types/array.ts

@@ -1,9 +1,12 @@
 import { Ty } from "./Ty.js"
 
-export function array<E extends Ty>(element: E): Ty<Array<E[Ty.T]>, E[Ty.P]> {
-  return Ty((description, ref) => ({
-    type: "array",
-    description,
-    items: ref(element),
-  }))
+export function array<E extends Ty>(element: E): Ty<Array<E["T"]>, E["P"], false> {
+  return Ty(
+    (ref) => ({
+      type: "array",
+      items: ref(element),
+    }),
+    false,
+    (value) => value.map(element[""].transform),
+  )
 }

package/src/types/constantUnion.ts

@@ -3,25 +3,22 @@ import { Ty } from "./Ty.js"
 
 export function constantUnion<M extends Array<number | string>>(
   ...members: M
-): Ty<M[number], never> {
+): Ty<M[number], never, false> {
   const [strings, numbers] = partition(members, (v) => typeof v === "string")
-  return Ty((description) => {
-    return {
-      anyOf: [
-        ...strings.length
-          ? [{
-            type: "string",
-            enum: strings,
-          }]
-          : [],
-        ...numbers.length
-          ? [{
-            type: "number",
-            enum: numbers,
-          }]
-          : [],
-      ],
-      description,
-    }
-  })
+  return Ty(() => ({
+    anyOf: [
+      ...strings.length
+        ? [{
+          type: "string",
+          enum: strings,
+        }]
+        : [],
+      ...numbers.length
+        ? [{
+          type: "number",
+          enum: numbers,
+        }]
+        : [],
+    ],
+  }), false)
 }

package/src/types/mod.ts

@@ -1,10 +1,9 @@
 export * from "./array.js"
-export * from "./leaves.js"
-export * from "./constant.js"
 export * from "./constantUnion.js"
-export * from "./std/mod.js"
 export * from "./object.js"
-export * from "./Ref.js"
+export * from "./primitives.js"
+export * from "./std/mod.js"
 export * from "./taggedUnion.js"
+export * from "./transform.js"
+export * from "./tuple.js"
 export * from "./Ty.js"
-export * from "./RootTy.js"

package/src/types/object.ts

@@ -1,15 +1,19 @@
-import { RootTy } from "./RootTy.js"
-import type { Ty } from "./Ty.js"
+import { Ty } from "./Ty.js"
 
-export function object<F extends Record<string, Ty>>(fields: F): RootTy<
-  { [K in keyof F]: F[K][Ty.T] },
-  F[keyof F][Ty.P]
-> {
-  return RootTy((description, ref) => ({
-    type: "object",
-    description,
-    properties: Object.fromEntries(Object.entries(fields).map(([k, v]) => [k, ref(v)])),
-    additionalProperties: false,
-    required: Object.keys(fields),
-  }))
+export function object<F extends Record<string, Ty>>(
+  fields: F,
+): Ty<{ [K in keyof F]: F[K]["T"] }, F[keyof F]["P"], true> {
+  return Ty(
+    (ref) => ({
+      type: "object",
+      properties: Object.fromEntries(Object.entries(fields).map(([k, v]) => [k, ref(v)])),
+      additionalProperties: false,
+      required: Object.keys(fields),
+    }),
+    true,
+    (v) =>
+      Object.fromEntries(
+        Object.entries(v).map(([k, v]) => [k, fields[k]![""].transform(v)]),
+      ) as never,
+  )
 }

package/src/types/primitives.ts

@@ -0,0 +1,17 @@
+import { Ty } from "./Ty.js"
+
+export const none: Ty<null, never, false> = Ty(() => ({
+  type: "null",
+}), false)
+
+export const boolean: Ty<boolean, never, false> = Ty(() => ({
+  type: "boolean",
+}), false)
+
+export const number: Ty<number, never, false> = Ty(() => ({
+  type: "number",
+}), false)
+
+export const string: Ty<string, never, false> = Ty(() => ({
+  type: "string",
+}), false)