Remove Constant Type, Misc. Tweaks

types/Ty.test.ts

@@ -1,7 +1,6 @@
 import { assertEquals } from "@std/assert"
 import { assertTySnapshot } from "test_util"
-import { SubschemaFactory } from "./schema.ts"
-import { Ty } from "./Ty.ts"
+import { SubschemaFactory, Ty } from "./Ty.ts"
 
 export const any = Ty<unknown, never, true>(() => ({
   type: ["string", "number", "object", "array", "boolean", "null"],

types/Ty.ts

@@ -1,4 +1,4 @@
-import { type Schema, type Subschema, SubschemaFactory } from "./schema.ts"
+import { recombine } from "../util/recombine.ts"
 
 export interface Ty<T = any, P extends keyof any = keyof any, R extends boolean = boolean> {
   <P2 extends Array<keyof any>>(
@@ -66,9 +66,26 @@ export function Ty<T, P extends keyof any, R extends boolean, I = T>(
   )
 }
 
-export interface Context {
+export type Subschema = (subschema: SubschemaFactory) => Schema
+
+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 } : {},
+    }
+  }
+}
+
+interface Context {
   template: TemplateStringsArray
   placeheld: Array<keyof any>
 }
+type Applied = Record<keyof any, number | string>
 
-export type Applied = Record<keyof any, number | string>
+export type Schema = Record<string, unknown>

types/mod.ts

@@ -1,9 +1,7 @@
 export * from "./array.ts"
-export * from "./constant.ts"
 export * from "./constantUnion.ts"
 export * from "./object.ts"
 export * from "./primitives.ts"
-export * from "./schema.ts"
 export * from "./std/mod.ts"
 export * from "./taggedUnion.ts"
 export * from "./transform.ts"

types/taggedUnion.ts

@@ -1,5 +1,4 @@
-import type { Schema } from "./schema.ts"
-import { Ty } from "./Ty.ts"
+import { type Schema, Ty } from "./Ty.ts"
 
 export function taggedUnion<M extends Record<string, Ty>>(members: M): Ty<
   {