@boundaryml/baml-bridge-web 0.16.0 → 0.17.0

package/dist/shared/wire_ty.js

@@ -1,25 +1,79 @@
-// wire_ty.ts — lower a host-supplied type token to a wire `Ty` (baml_type.proto).
-//
-// The Node analog of `python_type_to_wire_ty` / `_fill_wire_ty` in
-// sdks/python/src/baml_bridge/proto.py. Python recovers a generic instance's
-// concrete type args from Pydantic's runtime generic metadata and lowers
-// Python `type` objects (`int`, `str`, `Box[int]`, …) to a wire `Ty`. TypeScript
-// erases generics at runtime, so there is no metadata to recover and no `type`
-// object to inspect — the host must spell the binding explicitly. A generic
-// class instance carries its bindings in a `$types` field, and a generic
-// function/method call carries them in a `$types` call option; both hold
-// {@link BamlType} tokens that this module lowers.
-//
-// `undefined` / `null` (an absent binding) lowers to the unknown/top type —
-// the engine treats it as a wildcard, matching Python's `_fill_wire_ty(None)`.
+// Host type tokens and opaque BEP-066 reflected type definitions.
 import { baml_bridge } from './proto/baml_cffi.js';
 import { getTypeMap } from './typemap.js';
 const TyPrimitiveKind = baml_bridge.cffi.v1.BamlTyPrimitiveKind;
+const BamlTyDefMessage = baml_bridge.cffi.v1.BamlTyDef;
+/** The bottom type (BAML `never`). */
+export const Never = Symbol('baml.Never');
+/** Internal row consumed by the generated `reflect.class.new` binding. */
+export class BamlTypeMetadataRow {
+    ty;
+    alias;
+    description;
+    docstring;
+    other;
+    constructor(ty, alias, description, docstring, other = {}) {
+        this.ty = ty;
+        this.alias = alias;
+        this.description = description;
+        this.docstring = docstring;
+        this.other = other;
+    }
+}
+function cloneDefinition(definition) {
+    const message = BamlTyDefMessage.fromObject(definition);
+    return BamlTyDefMessage.decode(BamlTyDefMessage.encode(message).finish());
+}
 /**
- * The bottom type (BAML `never`). Pass as a `$types` binding to bind a TypeVar
- * to `never`, mirroring Python's `_types={"T": Never}`.
+ * Opaque, runtime-local handle for a reflected BAML definition. Only the
+ * composing operations required by H-11 are public. Each wire occurrence
+ * carries a copied definition graph; JavaScript identity is never type
+ * identity.
  */
-export const Never = Symbol('baml.Never');
+export class BamlType {
+    #definition;
+    constructor(definition) {
+        this.#definition = cloneDefinition(definition);
+    }
+    /** @internal Bridge/codegen hook; not a host inspection surface. */
+    static _fromWire(definition) {
+        return new BamlType(definition);
+    }
+    /** @internal Bridge hook returning a fresh protobuf graph. */
+    _wireCopy() {
+        return cloneDefinition(this.#definition);
+    }
+    static from(token) {
+        return token instanceof BamlType
+            ? token
+            : new BamlType({ root: lowerTypeToWireTy(token) });
+    }
+    meta(options = {}) {
+        return new BamlTypeMetadataRow(this, options.alias ?? null, options.description ?? null, options.docstring ?? null, { ...(options.other ?? {}) });
+    }
+    array() {
+        const definition = this._wireCopy();
+        definition.root = { list: { item: definition.root } };
+        return new BamlType(definition);
+    }
+    optional() {
+        const definition = this._wireCopy();
+        definition.root = { optional: { inner: definition.root } };
+        return new BamlType(definition);
+    }
+    toJSON() {
+        throw new TypeError('BamlType values are runtime handles and cannot be serialized');
+    }
+    toString() {
+        return 'BamlType(<opaque>)';
+    }
+}
+/** Runtime member installed as generated `reflect.type`. */
+export const reflectType = Object.freeze({
+    of(token) {
+        return BamlType.from(token);
+    },
+});
 const PRIMITIVE_KIND = {
     int: TyPrimitiveKind.BAML_TY_PRIMITIVE_INT,
     float: TyPrimitiveKind.BAML_TY_PRIMITIVE_FLOAT,
@@ -29,53 +83,67 @@ const PRIMITIVE_KIND = {
     bytes: TyPrimitiveKind.BAML_TY_PRIMITIVE_BYTES,
     bigint: TyPrimitiveKind.BAML_TY_PRIMITIVE_BIGINT,
 };
-/**
- * Lower a {@link BamlType} token to a wire `BamlTy` (an `IBamlTy` plain object the
- * protobufjs `fromObject` path accepts). Mirrors `_fill_wire_ty`: an
- * unrecognized or absent token leaves the unknown/top type, which binds
- * nothing.
- */
+function unsupported(token) {
+    const rendered = typeof token === 'function'
+        ? token.name || '<anonymous constructor>'
+        : Object.prototype.toString.call(token);
+    throw new TypeError(`unsupported TypeScript type token: ${rendered}`);
+}
+/** Lower a statically-known token to a sparse wire `BamlTy`. */
 export function lowerTypeToWireTy(token) {
-    // Absent binding → unknown/top (matches Python's `_fill_wire_ty(None)`).
-    if (token === null || token === undefined) {
-        return { unknown: {} };
-    }
-    // Bottom type.
-    if (token === Never) {
+    if (token === Never)
         return { never: {} };
-    }
-    // Primitive spelling.
+    if (token === String)
+        return { primitive: { kind: PRIMITIVE_KIND.string } };
+    if (token === Boolean)
+        return { primitive: { kind: PRIMITIVE_KIND.bool } };
+    if (token === BigInt)
+        return { primitive: { kind: PRIMITIVE_KIND.bigint } };
+    if (token === Uint8Array)
+        return { primitive: { kind: PRIMITIVE_KIND.bytes } };
     if (typeof token === 'string') {
         const kind = PRIMITIVE_KIND[token];
-        if (kind !== undefined) {
+        if (kind !== undefined)
             return { primitive: { kind } };
-        }
-        return { unknown: {} };
+        return unsupported(token);
     }
-    // A bare class constructor → that class, no concrete args.
     if (typeof token === 'function') {
-        return classWireTy(token, []);
+        return namedWireTy(token, []);
     }
-    if (typeof token === 'object') {
-        if ('class' in token) {
-            return classWireTy(token.class, token.args ?? []);
+    if (token !== null && typeof token === 'object') {
+        const shape = token;
+        if ('__baml_interface_fqn__' in shape) {
+            const name = shape.__baml_interface_fqn__;
+            if (typeof name !== 'string' || !name)
+                return unsupported(token);
+            return { interface: { name } };
         }
-        if ('list' in token) {
-            return { list: { item: lowerTypeToWireTy(token.list) } };
+        if ('class' in shape) {
+            const args = shape.args === undefined ? [] : shape.args;
+            if (!Array.isArray(args))
+                return unsupported(token);
+            return namedWireTy(shape.class, args);
         }
-        if ('map' in token) {
-            const [k, v] = token.map;
-            return { map: { key: lowerTypeToWireTy(k), value: lowerTypeToWireTy(v) } };
+        if ('list' in shape)
+            return { list: { item: lowerTypeToWireTy(shape.list) } };
+        if ('map' in shape) {
+            if (!Array.isArray(shape.map) || shape.map.length !== 2)
+                return unsupported(token);
+            const [key, value] = shape.map;
+            return { map: { key: lowerTypeToWireTy(key), value: lowerTypeToWireTy(value) } };
         }
-        if ('optional' in token) {
-            return { optional: { inner: lowerTypeToWireTy(token.optional) } };
-        }
-        if ('union' in token) {
-            return { union: { options: token.union.map(lowerTypeToWireTy) } };
+        if ('optional' in shape)
+            return { optional: { inner: lowerTypeToWireTy(shape.optional) } };
+        if ('union' in shape) {
+            if (!Array.isArray(shape.union))
+                return unsupported(token);
+            return { union: { options: shape.union.map(lowerTypeToWireTy) } };
         }
+        const fqn = getTypeMap().jsTypeToBamlType(token);
+        if (fqn)
+            return { enum: { name: fqn } };
     }
-    // Unrecognized: leave as unknown/top (binds nothing).
-    return { unknown: {} };
+    return unsupported(token);
 }
 const TY_PRIMITIVE_TOKEN = {
     [TyPrimitiveKind.BAML_TY_PRIMITIVE_INT]: 'int',
@@ -86,55 +154,55 @@ const TY_PRIMITIVE_TOKEN = {
     [TyPrimitiveKind.BAML_TY_PRIMITIVE_BYTES]: 'bytes',
     [TyPrimitiveKind.BAML_TY_PRIMITIVE_BIGINT]: 'bigint',
 };
-/**
- * Decode a wire `Ty` (baml_type.proto) back to a {@link BamlType} token — the
- * exact inverse of {@link lowerTypeToWireTy}, used to repopulate a generic
- * instance's `$types` field on decode. Mirrors the engine's
- * `ty_encode::runtime_ty_to_proto_ty` and Python's `_ty_to_python_type`.
- * Positions with no concrete JS binding (a structural union, an enum, a type
- * variable, an opaque/runtime-only type) decode to `undefined`, i.e. an unbound
- * wildcard.
- */
-export function outboundTyToBamlType(ty) {
+/** Decode the sparse value-level type channel on generated class instances. */
+export function outboundTyToBamlTypeToken(ty) {
     if (!ty)
         return undefined;
-    if (ty.primitive) {
-        return TY_PRIMITIVE_TOKEN[ty.primitive.kind ?? -1] ?? undefined;
+    if (ty.primitive)
+        return TY_PRIMITIVE_TOKEN[ty.primitive.kind ?? -1];
+    if (ty.list) {
+        const item = outboundTyToBamlTypeToken(ty.list.item);
+        return item === undefined ? undefined : { list: item };
     }
-    if (ty.list)
-        return { list: outboundTyToBamlType(ty.list.item) };
     if (ty.map) {
-        return { map: [outboundTyToBamlType(ty.map.key), outboundTyToBamlType(ty.map.value)] };
+        const key = outboundTyToBamlTypeToken(ty.map.key);
+        const value = outboundTyToBamlTypeToken(ty.map.value);
+        return key === undefined || value === undefined ? undefined : { map: [key, value] };
+    }
+    if (ty.optional) {
+        const inner = outboundTyToBamlTypeToken(ty.optional.inner);
+        return inner === undefined ? undefined : { optional: inner };
     }
-    if (ty.optional)
-        return { optional: outboundTyToBamlType(ty.optional.inner) };
     if (ty.classTy) {
-        const fqn = ty.classTy.name ?? '';
-        const args = (ty.classTy.typeArgs ?? []).map((a) => outboundTyToBamlType(a));
-        let ctor;
+        const token = resolveNamedToken(ty.classTy.name ?? '');
+        if (typeof token !== 'function')
+            return undefined;
+        const args = (ty.classTy.typeArgs ?? []).map(outboundTyToBamlTypeToken);
+        if (args.some((arg) => arg === undefined))
+            return undefined;
+        return args.length ? { class: token, args: args } : token;
+    }
+    if (ty.enum)
+        return resolveNamedToken(ty.enum.name ?? '');
+    return undefined;
+}
+function resolveNamedToken(fqn) {
+    try {
+        return getTypeMap().getClass(fqn);
+    }
+    catch {
         try {
-            ctor = getTypeMap().getClass(fqn);
+            return getTypeMap().getEnum(fqn);
         }
         catch {
-            ctor = undefined; // unmapped FQN — leave unbound
-        }
-        if (!ctor)
             return undefined;
-        return args.length ? { class: ctor, args } : ctor;
+        }
     }
-    // union / enum / literal / media / type_var / unknown / any other →
-    // unbound wildcard (a structural union is unbound for `class<args>`).
-    return undefined;
 }
-/** Build a `class_ty` wire `Ty` for a codegen class constructor and its
- * concrete generic args. The FQN comes from the typemap reverse map; an
- * unmapped constructor lowers to unknown so it can't manufacture a bogus
- * class reference. */
-function classWireTy(ctor, args) {
-    const fqn = getTypeMap().jsTypeToBamlType(ctor);
-    if (!fqn) {
-        return { unknown: {} };
-    }
+function namedWireTy(token, args) {
+    const fqn = getTypeMap().jsTypeToBamlType(token);
+    if (!fqn)
+        return unsupported(token);
     return { classTy: { name: fqn, typeArgs: args.map(lowerTypeToWireTy) } };
 }
 //# sourceMappingURL=wire_ty.js.map

package/dist/shared/wire_ty.js.map

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

package/dist/wasm/bridge_web_core.d.ts

@@ -171,8 +171,8 @@ export interface InitOutput {
     readonly cancel_function_call: (a: bigint) => number;
     readonly free_buffer: (a: number) => void;
     readonly new_function_call: () => bigint;
-    readonly __wasm_bindgen_func_elem_41706: (a: number, b: number, c: number, d: number) => void;
-    readonly __wasm_bindgen_func_elem_41719: (a: number, b: number, c: number, d: number) => void;
+    readonly __wasm_bindgen_func_elem_39162: (a: number, b: number, c: number, d: number) => void;
+    readonly __wasm_bindgen_func_elem_39175: (a: number, b: number, c: number, d: number) => void;
     readonly __wbindgen_export: (a: number, b: number) => number;
     readonly __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;
     readonly __wbindgen_export3: (a: number) => void;

package/dist/wasm/bridge_web_core.js

@@ -804,7 +804,7 @@ function __wbg_get_imports() {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return __wasm_bindgen_func_elem_41719(a, state0.b, arg0, arg1);
+                        return __wasm_bindgen_func_elem_39175(a, state0.b, arg0, arg1);
                     } finally {
                         state0.a = a;
                     }
@@ -911,8 +911,8 @@ function __wbg_get_imports() {
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000001: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 7252, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, __wasm_bindgen_func_elem_41706);
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 7327, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, __wasm_bindgen_func_elem_39162);
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000002: function(arg0) {
@@ -956,10 +956,10 @@ function __wbg_get_imports() {
     };
 }
 
-function __wasm_bindgen_func_elem_41706(arg0, arg1, arg2) {
+function __wasm_bindgen_func_elem_39162(arg0, arg1, arg2) {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        wasm.__wasm_bindgen_func_elem_41706(retptr, arg0, arg1, addHeapObject(arg2));
+        wasm.__wasm_bindgen_func_elem_39162(retptr, arg0, arg1, addHeapObject(arg2));
         var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
         var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
         if (r1) {
@@ -970,8 +970,8 @@ function __wasm_bindgen_func_elem_41706(arg0, arg1, arg2) {
     }
 }
 
-function __wasm_bindgen_func_elem_41719(arg0, arg1, arg2, arg3) {
-    wasm.__wasm_bindgen_func_elem_41719(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+function __wasm_bindgen_func_elem_39175(arg0, arg1, arg2, arg3) {
+    wasm.__wasm_bindgen_func_elem_39175(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
 function addHeapObject(obj) {

package/dist/wasm/bridge_web_core_bg.wasm.d.ts

@@ -44,8 +44,8 @@ export const mintHostValueKey: () => bigint;
 export const cancel_function_call: (a: bigint) => number;
 export const free_buffer: (a: number) => void;
 export const new_function_call: () => bigint;
-export const __wasm_bindgen_func_elem_41706: (a: number, b: number, c: number, d: number) => void;
-export const __wasm_bindgen_func_elem_41719: (a: number, b: number, c: number, d: number) => void;
+export const __wasm_bindgen_func_elem_39162: (a: number, b: number, c: number, d: number) => void;
+export const __wasm_bindgen_func_elem_39175: (a: number, b: number, c: number, d: number) => void;
 export const __wbindgen_export: (a: number, b: number) => number;
 export const __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_export3: (a: number) => void;

package/dist/workerd/index.d.ts

@@ -5,7 +5,8 @@ export { BamlTypeMap, getTypeMap, setTypeMap } from "./shared/typemap.js";
 export { defineFunction, defineInstanceFunction, UNSET } from "./shared/define_function.js";
 export type { GenericParams } from "./shared/define_function.js";
 export { Never, lowerTypeToWireTy } from "./shared/wire_ty.js";
-export type { BamlClassCtor, BamlPrimitiveToken, BamlType } from "./shared/wire_ty.js";
+export { BamlType, reflectType } from "./shared/wire_ty.js";
+export type { BamlClassCtor, BamlInterfaceToken, BamlPrimitiveToken, BamlTypeMetadata, BamlTypeToken } from "./shared/wire_ty.js";
 export { BamlAbortError, BamlCancelledError, BamlClientError, BamlError, BamlInvalidArgumentError, BamlPanic, wrapNativeError } from "./shared/errors.js";
 export { decodeCallResult, encodeCallArgs } from "./shared/proto.js";
 export declare function initializeRuntimeFromBytecode(bytecode: Uint8Array, embeddedBamlToml?: string): void;

package/dist/workerd/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../typescript_src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAA4I,MAAM,aAAa,CAAC;AAMjO,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,WAAW,EAAE,uBAAuB,EAAE,UAAU,EAAE,mBAAmB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9T,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC5F,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,eAAe,EAAE,SAAS,EAAE,wBAAwB,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1J,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAErE,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,UAAU,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAEnG;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAErF;AAED,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,OAAO;IAC3C,MAAM,IAAI,OAAO;IACjB,QAAQ,IAAI,MAAM;CACnB;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,cAAc,CASnM;AAED,wBAAsB,YAAY,CAAC,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAS9M;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,GAAG,IAAI,eAAe;IACtB,UAAU,IAAI,OAAO;IACrB,KAAK,IAAI,IAAI;IACb,YAAY,IAAI,eAAe;IAC/B,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;CAC/C;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE1D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../typescript_src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAA4I,MAAM,aAAa,CAAC;AAMjO,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,WAAW,EAAE,uBAAuB,EAAE,UAAU,EAAE,mBAAmB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9T,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC5F,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC5D,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClI,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,eAAe,EAAE,SAAS,EAAE,wBAAwB,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1J,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAErE,wBAAgB,6BAA6B,CAAC,QAAQ,EAAE,UAAU,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAEnG;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAErF;AAED,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,OAAO;IAC3C,MAAM,IAAI,OAAO;IACjB,QAAQ,IAAI,MAAM;CACnB;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,cAAc,CASnM;AAED,wBAAsB,YAAY,CAAC,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,SAAS,EAAE,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAS9M;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,GAAG,IAAI,eAAe;IACtB,UAAU,IAAI,OAAO;IACrB,KAAK,IAAI,IAAI;IACb,YAAY,IAAI,eAAe;IAC/B,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;CAC/C;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE1D"}

package/dist/workerd/index.js

@@ -12,6 +12,7 @@ export { BamlStream } from "./shared/stream.js";
 export { BamlTypeMap, getTypeMap, setTypeMap } from "./shared/typemap.js";
 export { defineFunction, defineInstanceFunction, UNSET } from "./shared/define_function.js";
 export { Never, lowerTypeToWireTy } from "./shared/wire_ty.js";
+export { BamlType, reflectType } from "./shared/wire_ty.js";
 export { BamlAbortError, BamlCancelledError, BamlClientError, BamlError, BamlInvalidArgumentError, BamlPanic, wrapNativeError } from "./shared/errors.js";
 export { decodeCallResult, encodeCallArgs } from "./shared/proto.js";
 export function initializeRuntimeFromBytecode(bytecode, embeddedBamlToml) {

package/dist/workerd/index.js.map

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

package/dist/workerd/shared/define_function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"define_function.d.ts","sourceRoot":"","sources":["../../typescript_src/shared/define_function.ts"],"names":[],"mappings":"AAuBA,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC;AAEpC,8EAA8E;AAC9E,eAAO,MAAM,KAAK,EAAE,OAAO,MAA6B,CAAC;AAEzD;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC1B,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAuKD;;;;GAIG;AACH,wBAAgB,cAAc,CAC1B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,SAAS,MAAM,EAAE,EACrC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAClD,QAAQ,CAAC,EAAE,aAAa,GAAG,SAAS,GACrC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CA4CjC;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAClC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,SAAS,MAAM,EAAE,EACrC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAClD,QAAQ,CAAC,EAAE,aAAa,GAAG,SAAS,GACrC;IAAE,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAA;CAAE,CAyD1D"}
+{"version":3,"file":"define_function.d.ts","sourceRoot":"","sources":["../../typescript_src/shared/define_function.ts"],"names":[],"mappings":"AAuBA,MAAM,MAAM,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC;AAEpC,8EAA8E;AAC9E,eAAO,MAAM,KAAK,EAAE,OAAO,MAA6B,CAAC;AAEzD;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC1B,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAkKD;;;;GAIG;AACH,wBAAgB,cAAc,CAC1B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,SAAS,MAAM,EAAE,EACrC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAClD,QAAQ,CAAC,EAAE,aAAa,GAAG,SAAS,GACrC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CA4CjC;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAClC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,IAAI,EACV,kBAAkB,EAAE,SAAS,MAAM,EAAE,EACrC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAClD,QAAQ,CAAC,EAAE,aAAa,GAAG,SAAS,GACrC;IAAE,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAA;CAAE,CAyD1D"}

package/dist/workerd/shared/define_function.js

@@ -13,14 +13,13 @@
 import { getRuntime, newFunctionCall as nativeNewFunctionCall, } from '../native.js';
 import { encodeCallArgs, decodeCallResult } from './proto.js';
 import { attachCallContext } from './call_context.js';
-import { lowerTypeToWireTy } from './wire_ty.js';
+import { BamlType, lowerTypeToWireTy } from './wire_ty.js';
 /** Sentinel for "argument not supplied" so optional kwargs can be skipped. */
 export const UNSET = Symbol('baml.UNSET');
 /**
  * Resolve the caller's `$types` option onto the callee's own generic params, in
- * declaration order. Mirrors Python's `_resolve_types_kwarg`: `$types` is an
- * object keyed by param name and is required iff the callee declares its own
- * generic params; it must bind exactly those params (no missing, no extras).
+ * declaration order. Omitted bindings are inferred by the engine; supplied
+ * names must belong to the callee.
  */
 function resolveTypesOption(typesOpt, typeParams) {
     if (typeParams.length === 0) {
@@ -30,27 +29,23 @@ function resolveTypesOption(typesOpt, typeParams) {
         }
         return [];
     }
-    const example = `{ ${JSON.stringify(typeParams[0])}: 'int' }`;
     if (typesOpt === undefined || typesOpt === null) {
-        throw new TypeError(`$types is required for this generic call: bind every type parameter in ` +
-            `${JSON.stringify(typeParams)} with an object, e.g. $types: ${example}`);
+        return [];
     }
+    const example = `{ ${JSON.stringify(typeParams[0])}: 'int' }`;
     if (typeof typesOpt !== 'object' || Array.isArray(typesOpt)) {
         throw new TypeError(`$types must be an object mapping type-parameter names to types (e.g. ` +
             `$types: ${example}); got ${typeof typesOpt}`);
     }
     const obj = typesOpt;
-    const missing = typeParams.filter((n) => !(n in obj));
-    if (missing.length) {
-        throw new TypeError(`$types is missing binding(s) for ${JSON.stringify(missing)}: every type parameter ` +
-            `in ${JSON.stringify(typeParams)} must be bound.`);
-    }
     const extra = Object.keys(obj).filter((k) => !typeParams.includes(k));
     if (extra.length) {
-        throw new TypeError(`$types has unknown type parameter(s) ${JSON.stringify(extra)}; expected exactly ` +
+        throw new TypeError(`$types has unknown type parameter(s) ${JSON.stringify(extra)}; expected ` +
             `${JSON.stringify(typeParams)}.`);
     }
-    return typeParams.map((n) => obj[n]);
+    return typeParams
+        .filter((name) => obj[name] !== undefined)
+        .map((name) => [name, obj[name]]);
 }
 /** The `$types` field of a generic receiver instance (its class TypeVar
  * bindings), or `undefined` when the receiver carries none. The TS analog of
@@ -77,20 +72,23 @@ function buildTypeArgs(self, typesOpt, typeParams, classTypeParams) {
     const classTypes = classTypeParams.length ? receiverTypes(self) : undefined;
     if (classTypes) {
         for (const name of classTypeParams) {
-            wire.push([name, lowerTypeToWireTy(classTypes[name])]);
+            const token = classTypes[name];
+            if (token !== undefined) {
+                wire.push([name, token instanceof BamlType ? token : lowerTypeToWireTy(token)]);
+            }
         }
     }
     const resolved = resolveTypesOption(typesOpt, typeParams);
-    if (typeParams.length > 0) {
+    if (resolved.length > 0) {
         if (classTypeParams.length && !classTypes) {
             // The method's own params sit after the class prefix in De Bruijn
             // order; without recovered class args we can't position them.
             throw new TypeError('$types on a generic method requires a generic receiver carrying its class type ' +
                 'args (a `$types` field on the instance)');
         }
-        typeParams.forEach((name, i) => {
-            wire.push([name, lowerTypeToWireTy(resolved[i])]);
-        });
+        for (const [name, token] of resolved) {
+            wire.push([name, token instanceof BamlType ? token : lowerTypeToWireTy(token)]);
+        }
     }
     return wire;
 }

package/dist/workerd/shared/define_function.js.map

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