structured-outputs 0.1.0-beta.20 → 0.1.0-beta.22

package/esm/types/primitives.js

@@ -0,0 +1,14 @@
+import { Ty } from "./Ty.js";
+export const none = Ty(() => ({
+    type: "null",
+}));
+export const boolean = Ty(() => ({
+    type: "boolean",
+}));
+export const number = Ty(() => ({
+    type: "number",
+}));
+export const string = Ty(() => ({
+    type: "string",
+}));
+//# sourceMappingURL=primitives.js.map

package/esm/types/primitives.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"primitives.js","sourceRoot":"","sources":["../../src/types/primitives.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAA;AAE5B,MAAM,CAAC,MAAM,IAAI,GAAoB,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7C,IAAI,EAAE,MAAM;CACb,CAAC,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAuB,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACnD,IAAI,EAAE,SAAS;CAChB,CAAC,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,MAAM,GAAsB,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACjD,IAAI,EAAE,QAAQ;CACf,CAAC,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,MAAM,GAAsB,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACjD,IAAI,EAAE,QAAQ;CACf,CAAC,CAAC,CAAA"}

package/esm/types/std/Option.js

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

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/{types → 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

@@ -0,0 +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,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/{types → 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"]>;
 //# sourceMappingURL=taggedUnion.d.ts.map

package/{types → 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;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,GAAG,CAAC,CAAA;KACjB;CACF,CAAC,MAAM,CAAC,CAAC,EACV,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAChB,CAgBA"}

package/esm/types/taggedUnion.js

@@ -1,7 +1,6 @@
 import { Ty } from "./Ty.js";
 export function taggedUnion(members) {
-    return Ty((description, ref) => ({
-        description,
+    return Ty((ref) => ({
         discriminator: "type",
         anyOf: Object.entries(members).map(([k, v]) => ({
             type: "object",

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;AAE5B,MAAM,UAAU,WAAW,CAA+B,OAAU;IASlE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAClB,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"}

package/package.json

@@ -1,23 +1,18 @@
 {
   "name": "structured-outputs",
-  "version": "0.1.0-beta.20",
-  "description": "Compose OpenAI structured output schemas.",
+  "version": "0.1.0-beta.22",
+  "description": "A library for working with OpenAI's structured outputs.",
   "repository": "github:harrysolovay/structured-outputs.git",
   "license": "Apache-2.0",
   "main": "./esm/mod.js",
   "module": "./esm/mod.js",
-  "types": "./types/mod.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./types/mod.d.ts",
-        "default": "./esm/mod.js"
-      }
+      "import": "./esm/mod.js"
     }
   },
-  "dependencies": {
-    "tslib": "^2.6.2",
+  "_generatedBy": "dnt@dev",
+  "peerDependencies": {
     "openai": "^4.68.1"
-  },
-  "_generatedBy": "dnt@dev"
+  }
 }

package/src/ResponseFormat.ts

@@ -1,9 +1,18 @@
-import { assert } from "./deps/jsr.io/@std/assert/1.0.8/mod.js"
-import type Openai from "openai"
-import type { ResponseFormatJSONSchema } from "openai/resources/index.js"
+import type { ChatCompletion, ChatCompletionChoice, JsonSchema } from "./oai.js"
 import type { RootTy } from "./types/mod.js"
 import { recombineTaggedTemplateArgs } from "./util/recombineTaggedTemplateArgs.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>
+}
+
 export function ResponseFormat<T>(name: string, ty: RootTy<T, never>): ResponseFormat<T> {
   return ResponseFormat_(name, ty)
 }
@@ -28,25 +37,11 @@ function ResponseFormat_<T>(
         schema: ty.schema(),
         strict: true,
       },
-      parse(completion: ChatCompletion): TypedChatCompletion<T> {
-        return {
-          ...completion,
-          choices: completion.choices.map((choice) => ({
-            ...choice,
-            message: {
-              ...choice.message,
-              content: choice.message.content ? JSON.parse(choice.message.content) : null,
-            },
-          })),
-        }
+      parseFirstChoice: (completion: ChatCompletion): T => {
+        return JSON.parse(ResponseFormat.unwrapFirstChoice(completion))
       },
-      parseFirstOrThrow(completion: ChatCompletion): T {
-        const { choices: [firstChoice], usage } = completion
-        assert(firstChoice)
-        const { finish_reason, message } = firstChoice
-        const { content, refusal } = message
-        assert(content, JSON.stringify({ finish_reason, refusal, usage }))
-        return JSON.parse(content)
+      parseChoices: (completion: ChatCompletion): Array<T> => {
+        return ResponseFormat.unwrapChoices(completion).map((content) => JSON.parse(content))
       },
       toJSON() {
         const { type, json_schema } = this
@@ -56,27 +51,39 @@ function ResponseFormat_<T>(
   )
 }
 
-export interface ResponseFormat<T> {
-  (template: TemplateStringsArray, ...quasis: Array<string>): ResponseFormat<T>
-  type: "json_schema"
-  /** The desired return type in JSON Schema. */
-  json_schema: ResponseFormatJSONSchema.JSONSchema
-  /** Parse inner responses into a typed object. */
-  parse(completion: ChatCompletion): TypedChatCompletion<T>
-  /** Parse and return the first inner response into a typed object. */
-  parseFirstOrThrow(completion: ChatCompletion): T
-}
+export namespace ResponseFormat {
+  export function unwrapFirstChoice(completion: ChatCompletion): string {
+    const { choices: [firstChoice] } = completion
+    if (!firstChoice) {
+      throw new ResponseFormatUnwrapError("No choices contained within the completion response.")
+    }
+    return unwrapChoice(firstChoice)
+  }
 
-export type TypedChatCompletion<T> = Omit<ChatCompletion, "choices"> & {
-  choices: Array<
-    Omit<ChatCompletionChoice, "message"> & {
-      message: Omit<ChatCompletionMessage, "content"> & {
-        content: T
-      }
+  export function unwrapChoices(completions: ChatCompletion): string[] {
+    return completions.choices.map(unwrapChoice)
+  }
+
+  function unwrapChoice(choice: ChatCompletionChoice) {
+    const { finish_reason, message } = choice
+    if (finish_reason !== "stop") {
+      throw new ResponseFormatUnwrapError(
+        `Completion responded with "${finish_reason}" as finish reason; ${message}`,
+      )
+    }
+    const { content, refusal } = message
+    if (refusal) {
+      throw new ResponseFormatUnwrapError(
+        `Openai refused to fulfill completion request; ${refusal}`,
+      )
     }
-  >
+    if (!content) {
+      throw new ResponseFormatUnwrapError("First response choice contained no content.")
+    }
+    return content
+  }
 }
 
-type ChatCompletion = Openai.Chat.ChatCompletion
-type ChatCompletionChoice = Openai.Chat.ChatCompletion.Choice
-type ChatCompletionMessage = Openai.Chat.Completions.ChatCompletionMessage
+export class ResponseFormatUnwrapError extends Error {
+  override readonly name = "UnwrapResponseError"
+}

package/src/Tool.ts

@@ -1,6 +1,7 @@
 import type { RootTy, Schema } from "./types/mod.js"
 import { recombineTaggedTemplateArgs } from "./util/recombineTaggedTemplateArgs.js"
 
+/** @experimental */
 export function Tool<T>(name: string, ty: RootTy<T, never>): Tool<T> {
   return Tool_(name, ty)
 }

package/src/oai.ts

@@ -0,0 +1,5 @@
+import type Openai from "openai"
+
+export type JsonSchema = Openai.ResponseFormatJSONSchema["json_schema"]
+export type ChatCompletion = Openai.Chat.ChatCompletion
+export type ChatCompletionChoice = Openai.Chat.Completions.ChatCompletion.Choice

package/src/types/Ref.ts

@@ -1,16 +1,19 @@
-import type { Applied, Schema, Ty } from "./Ty.js"
 import { recombineTaggedTemplateArgs } from "../util/recombineTaggedTemplateArgs.js"
+import type { Applied, Schema, Ty } from "./Ty.js"
 
 export type Ref = (ty: Ty) => Schema
 
 export function Ref(applied: Applied): Ref {
   return (ty) => {
-    applied = { ...applied, ...ty.applied }
-    const description = ty.descriptions
+    applied = { ...applied, ...ty[""].applied }
+    const description = ty[""].context
       .map(({ template, placeheld }) =>
         recombineTaggedTemplateArgs(template, placeheld.map((k) => applied[k]!))
       )
       .join(" ")
-    return ty.toSchema(description, Ref(applied))
+    return {
+      ...ty[""].toSchema(Ref(applied)),
+      ...description ? { description } : {},
+    }
   }
 }

package/src/types/RootTy.ts

@@ -1,22 +1,20 @@
 import { phantoms } from "../util/phantoms.js"
 import { Ref } from "./Ref.js"
-import type { Applied, Description, Schema, ToSchema, Ty } from "./Ty.js"
+import type { Applied, Context, Schema, ToSchema, Ty } from "./Ty.js"
 
-export function RootTy<T, P extends string = never>(
+export function RootTy<T, P extends keyof any = never>(
   toSchema: ToSchema,
-  descriptions: Array<Description> = [],
+  context: Array<Context> = [],
   applied: Applied = {},
 ): RootTy<T, P> {
   return Object.assign(
     <P2 extends Array<string>>(template: TemplateStringsArray, ...placeheld: P2) =>
-      RootTy<T, P | P2[number]>(toSchema, [{ template, placeheld }, ...descriptions], applied),
-    phantoms<{ [Ty.T]: T; [Ty.P]: P }>(),
+      RootTy<T, P | P2[number]>(toSchema, [{ template, placeheld }, ...context], applied),
+    phantoms<{ T: T; P: P }>(),
     {
-      toSchema,
-      descriptions,
-      applied,
-      apply: <A extends Partial<Record<P, string | number>>>(values: A) => {
-        return RootTy<T, Exclude<P, keyof A>>(toSchema, descriptions, { ...applied, ...values })
+      "": { toSchema, context, applied },
+      fill: <A extends Partial<Record<P, string | number>>>(values: A) => {
+        return RootTy<T, Exclude<P, keyof A>>(toSchema, context, { ...applied, ...values })
       },
       schema(this: RootTy<T, never>) {
         return Ref({})(this)
@@ -28,12 +26,12 @@ export function RootTy<T, P extends string = never>(
   )
 }
 
-export interface RootTy<T = any, P extends string = string> extends Ty<T, P> {
-  <P2 extends Array<string>>(
+export interface RootTy<T = any, P extends keyof any = keyof any> extends Ty<T, P> {
+  <P2 extends Array<keyof any>>(
     template: TemplateStringsArray,
     ...placeheld: P2
   ): RootTy<T, P | P2[number]>
-  apply: <A extends Partial<Record<P, number | string>>>(
+  fill: <A extends Partial<Record<P, number | string>>>(
     values: A,
   ) => RootTy<T, Exclude<P, keyof A>>
   schema(this: RootTy<T, never>): Schema

package/src/types/Ty.ts

@@ -1,22 +1,20 @@
-import type { Ref } from "./Ref.js"
 import { phantoms } from "../util/phantoms.js"
+import type { Ref } from "./Ref.js"
 import type { RootTy } from "./RootTy.js"
 
-export function Ty<T, P extends string = never>(
+export function Ty<T, P extends keyof any = never>(
   toSchema: ToSchema,
-  descriptions: Array<Description> = [],
+  context: Array<Context> = [],
   applied: Applied = {},
 ): Ty<T, P> {
   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]>(toSchema, [{ template, placeheld }, ...context], applied),
+    phantoms<{ 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 })
+      "": { toSchema, context, applied },
+      fill: <A extends Partial<Record<P, string | number>>>(values: A) => {
+        return Ty<T, Exclude<P, keyof A>>(toSchema, context, { ...applied, ...values })
       },
       isRoot(): this is RootTy {
         return false
@@ -25,33 +23,28 @@ export function Ty<T, P extends string = never>(
   )
 }
 
-export interface Ty<T = any, P extends string = string> {
-  <P2 extends Array<string>>(
+export interface Ty<T = any, P extends keyof any = keyof any> {
+  <P2 extends Array<keyof any>>(
     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>>
+  T: T
+  P: P
+  "": {
+    toSchema: ToSchema
+    context: Array<Context>
+    applied: Applied
+  }
+  fill: <A extends Partial<Record<P, number | string>>>(values: A) => Ty<T, Exclude<P, keyof A>>
   isRoot(): this is RootTy
 }
 
-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 ToSchema = (description: string | undefined, ref: Ref) => Schema
+export type ToSchema = (ref: Ref) => Schema
 export type Schema = Record<string, unknown>
 
-export interface Description {
+export interface Context {
   template: TemplateStringsArray
-  placeheld: Array<string>
+  placeheld: Array<keyof any>
 }
 
-export type Applied = Record<string, number | string>
+export type Applied = Record<keyof any, number | string>

package/src/types/array.ts

@@ -1,9 +1,8 @@
 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) => ({
+export function array<E extends Ty>(element: E): Ty<Array<E["T"]>, E["P"]> {
+  return Ty((ref) => ({
     type: "array",
-    description,
     items: ref(element),
   }))
 }

package/src/types/constant.ts

@@ -1,8 +1,7 @@
 import { Ty } from "./Ty.js"
 
 export function constant<V extends number | string>(value: V): Ty<V, never> {
-  return Ty((description) => ({
+  return Ty(() => ({
     const: value,
-    description,
   }))
 }

package/src/types/constantUnion.ts

@@ -5,23 +5,20 @@ export function constantUnion<M extends Array<number | string>>(
   ...members: M
 ): Ty<M[number], never> {
   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,
+        }]
+        : [],
+    ],
+  }))
 }

package/src/types/mod.ts

@@ -1,10 +1,10 @@
 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 "./primitives.js"
 export * from "./Ref.js"
+export * from "./RootTy.js"
+export * from "./std/mod.js"
 export * from "./taggedUnion.js"
 export * from "./Ty.js"
-export * from "./RootTy.js"

package/src/types/object.ts

@@ -1,13 +1,11 @@
 import { RootTy } from "./RootTy.js"
 import type { 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) => ({
+export function object<F extends Record<string, Ty>>(
+  fields: F,
+): RootTy<{ [K in keyof F]: F[K]["T"] }, F[keyof F]["P"]> {
+  return RootTy((ref) => ({
     type: "object",
-    description,
     properties: Object.fromEntries(Object.entries(fields).map(([k, v]) => [k, ref(v)])),
     additionalProperties: false,
     required: Object.keys(fields),

package/src/types/primitives.ts

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

package/src/types/std/Option.ts

@@ -1,4 +1,4 @@
-import { none } from "../leaves.js"
+import { none } from "../primitives.js"
 import { taggedUnion } from "../taggedUnion.js"
 import type { Ty } from "../Ty.js"
 

package/src/types/std/Wrapper.ts

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

package/src/types/taggedUnion.ts

@@ -4,13 +4,12 @@ export 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]
+  M[keyof M]["P"]
 > {
-  return Ty((description, ref) => ({
-    description,
+  return Ty((ref) => ({
     discriminator: "type",
     anyOf: Object.entries(members).map(([k, v]) => ({
       type: "object",

package/esm/_dnt.shims.js

@@ -1,58 +0,0 @@
-const dntGlobals = {};
-export const dntGlobalThis = createMergeProxy(globalThis, dntGlobals);
-function createMergeProxy(baseObj, extObj) {
-    return new Proxy(baseObj, {
-        get(_target, prop, _receiver) {
-            if (prop in extObj) {
-                return extObj[prop];
-            }
-            else {
-                return baseObj[prop];
-            }
-        },
-        set(_target, prop, value) {
-            if (prop in extObj) {
-                delete extObj[prop];
-            }
-            baseObj[prop] = value;
-            return true;
-        },
-        deleteProperty(_target, prop) {
-            let success = false;
-            if (prop in extObj) {
-                delete extObj[prop];
-                success = true;
-            }
-            if (prop in baseObj) {
-                delete baseObj[prop];
-                success = true;
-            }
-            return success;
-        },
-        ownKeys(_target) {
-            const baseKeys = Reflect.ownKeys(baseObj);
-            const extKeys = Reflect.ownKeys(extObj);
-            const extKeysSet = new Set(extKeys);
-            return [...baseKeys.filter((k) => !extKeysSet.has(k)), ...extKeys];
-        },
-        defineProperty(_target, prop, desc) {
-            if (prop in extObj) {
-                delete extObj[prop];
-            }
-            Reflect.defineProperty(baseObj, prop, desc);
-            return true;
-        },
-        getOwnPropertyDescriptor(_target, prop) {
-            if (prop in extObj) {
-                return Reflect.getOwnPropertyDescriptor(extObj, prop);
-            }
-            else {
-                return Reflect.getOwnPropertyDescriptor(baseObj, prop);
-            }
-        },
-        has(_target, prop) {
-            return prop in extObj || prop in baseObj;
-        },
-    });
-}
-//# sourceMappingURL=_dnt.shims.js.map

package/esm/_dnt.shims.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_dnt.shims.js","sourceRoot":"","sources":["../src/_dnt.shims.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,GAAG,EAClB,CAAC;AACF,MAAM,CAAC,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAEtE,SAAS,gBAAgB,CACvB,OAAU,EACV,MAAS;IAET,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE;QACxB,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS;YAC1B,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;gBACnB,OAAQ,MAAc,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,OAAQ,OAAe,CAAC,IAAI,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;QACD,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK;YACtB,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;gBACnB,OAAQ,MAAc,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YACA,OAAe,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,cAAc,CAAC,OAAO,EAAE,IAAI;YAC1B,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;gBACnB,OAAQ,MAAc,CAAC,IAAI,CAAC,CAAC;gBAC7B,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YACD,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;gBACpB,OAAQ,OAAe,CAAC,IAAI,CAAC,CAAC;gBAC9B,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,CAAC,OAAO;YACb,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;YACpC,OAAO,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC;QACrE,CAAC;QACD,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI;YAChC,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;gBACnB,OAAQ,MAAc,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YACD,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,wBAAwB,CAAC,OAAO,EAAE,IAAI;YACpC,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;gBACnB,OAAO,OAAO,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACxD,CAAC;iBAAM,CAAC;gBACN,OAAO,OAAO,CAAC,wBAAwB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QACD,GAAG,CAAC,OAAO,EAAE,IAAI;YACf,OAAO,IAAI,IAAI,MAAM,IAAI,IAAI,IAAI,OAAO,CAAC;QAC3C,CAAC;KACF,CAAQ,CAAC;AACZ,CAAC"}