@pebble-software/bonsai 0.0.6 → 0.0.7

package/dist/index.d.ts

@@ -156,7 +156,29 @@ export declare const EXTRACTOR_ALLOWLIST: Record<string, (eventOrValue: unknown)
  */
 export declare type JsonSchema = Record<string, unknown>;
 
-export declare function jsonSchemaToZod(schema: JsonSchema): z.ZodType<unknown>;
+export declare function jsonSchemaToZod(schema: JsonSchema, options?: JsonSchemaToZodOptions): z.ZodType<unknown>;
+
+declare interface JsonSchemaToZodOptions {
+    /**
+     * Accept a `"{{expression}}"` binding anywhere a typed value is declared.
+     *
+     * A template author writes `checked: "{{form.agree}}"` and the binding is resolved at
+     * render time, long after validation runs — so a schema saying `{"type":"boolean"}`
+     * rejects a template that would render perfectly. The hand-rolled registry has always
+     * worked around this by declaring `z.union([z.string(), z.boolean()])` by hand on every
+     * affected prop. This is that convention made available to manifests whose schemas were
+     * machine-derived from component sources and so cannot hand-write it.
+     *
+     * Opt-in rather than automatic: `bonsai.generated.json` doubles as an LLM tool
+     * definition, and a prop that reads "boolean" there is worth keeping precise.
+     *
+     * Narrower than the hand-rolled convention on purpose — only binding-*shaped* strings
+     * are admitted, not every string. `{"type":"string","minLength":1}` therefore still
+     * rejects `""`, and an `enum` still rejects a value outside it, both of which a blanket
+     * `z.string()` union would silently discard.
+     */
+    allowBindings?: boolean;
+}
 
 export declare interface LoadManifestOptions extends ResolveManifestOptions {
     allowedOrigins?: string[];

package/dist/index.js

@@ -3825,10 +3825,10 @@ const Mt = {
     extractor: (e) => e
   }
 };
-function Yi(e) {
+function Ki(e) {
   return e;
 }
-function Ki(e) {
+function Zi(e) {
   return e;
 }
 const Bo = ["bindings", "formField", "ssr", "pdf"], jo = ["children", "bindings", "ssr", "pdf"];
@@ -4608,7 +4608,7 @@ function ii({
   }, l = te(a, 0, "root", void 0, void 0, "root-0");
   return /* @__PURE__ */ d(ie.Provider, { value: n ?? Ce, children: r === "pdf" ? /* @__PURE__ */ d("div", { "data-mode": r, className: "group bonsai-root w-full", children: l }) : /* @__PURE__ */ d("form", { "data-mode": r, className: "group bonsai-root", onSubmit: s, children: l }) });
 }
-function Zi(e) {
+function Qi(e) {
   return typeof window > "u" ? /* @__PURE__ */ d(oi, { ...e }) : /* @__PURE__ */ d(si, { ...e });
 }
 function si(e) {
@@ -4682,7 +4682,7 @@ function xe(e, a, r, n, o) {
     (p, m) => xe(p, `${a}.children[${m}]`, r, n, o)
   ));
 }
-function Qi(e, a, r = {}) {
+function es(e, a, r = {}) {
   const n = [], o = [];
   if (r.pin) {
     const s = di(r.pin, a);
@@ -4692,58 +4692,62 @@ function Qi(e, a, r = {}) {
   }
   return xe(e, "root", a, r.mode ?? "web", n), { valid: n.length === 0, errors: n, warnings: o };
 }
-function ve(e) {
+const ui = t.string().refine((e) => e.startsWith("{{") && e.endsWith("}}"), {
+  message: 'Expected a value of the declared type, or a "{{binding}}" expression'
+});
+function ve(e, a = {}) {
+  const r = (o) => a.allowBindings ? t.union([ui, o]) : o;
   if ("const" in e)
-    return t.literal(e.const);
+    return r(t.literal(e.const));
   if (Array.isArray(e.enum)) {
-    const r = e.enum;
-    if (r.length === 0)
+    const o = e.enum;
+    if (o.length === 0)
       throw new Error("jsonSchemaToZod: enum must have at least one value");
-    const [n, ...o] = r;
-    return o.reduce((s, l) => t.union([s, t.literal(l)]), t.literal(n));
+    const [s, ...l] = o;
+    return r(l.reduce((u, p) => t.union([u, t.literal(p)]), t.literal(s)));
   }
-  const a = e.type;
-  switch (a) {
+  const n = e.type;
+  switch (n) {
     case "string": {
-      let r = t.string();
-      return typeof e.minLength == "number" && (r = r.min(e.minLength)), typeof e.maxLength == "number" && (r = r.max(e.maxLength)), typeof e.pattern == "string" && (r = r.regex(new RegExp(e.pattern))), r;
+      let o = t.string();
+      return typeof e.minLength == "number" && (o = o.min(e.minLength)), typeof e.maxLength == "number" && (o = o.max(e.maxLength)), typeof e.pattern == "string" && (o = o.regex(new RegExp(e.pattern))), r(o);
     }
     case "number":
     case "integer": {
-      let r = t.number();
-      return a === "integer" && (r = r.int()), typeof e.minimum == "number" && (r = r.min(e.minimum)), typeof e.maximum == "number" && (r = r.max(e.maximum)), r;
+      let o = t.number();
+      return n === "integer" && (o = o.int()), typeof e.minimum == "number" && (o = o.min(e.minimum)), typeof e.maximum == "number" && (o = o.max(e.maximum)), r(o);
     }
     case "boolean":
-      return t.boolean();
+      return r(t.boolean());
     case "array": {
-      const r = e.items ? ve(e.items) : t.unknown();
-      return t.array(r);
+      const o = e.items ? ve(e.items, a) : t.unknown();
+      return r(t.array(o));
     }
     case "object": {
-      const r = e.properties ?? {}, n = new Set(e.required ?? []), o = {};
-      for (const [l, u] of Object.entries(r)) {
-        const p = ve(u);
-        o[l] = n.has(l) ? p : p.optional();
+      const o = e.properties ?? {}, s = new Set(e.required ?? []), l = {};
+      for (const [p, m] of Object.entries(o)) {
+        const x = ve(m, a);
+        l[p] = s.has(p) ? x : x.optional();
       }
-      let s = t.object(o);
-      return e.additionalProperties === !1 && (s = s.strict()), s;
+      let u = t.object(l);
+      return e.additionalProperties === !1 && (u = u.strict()), u;
     }
     default:
       return t.unknown();
   }
 }
-const ui = t.object({
+const pi = t.object({
   valueProp: t.string().min(1),
   changeProp: t.string().min(1),
   extract: t.string().min(1)
-}).strict(), pi = t.object({
+}).strict(), mi = t.object({
   name: t.string().min(1),
   canonicalName: t.string().min(1).optional(),
   // Case A: a key resolved against `base`'s exports, never a module path to import.
   entry: t.string().min(1),
   propsSchema: t.record(t.string(), t.unknown()).optional(),
   capabilities: t.array(t.enum(["children", "bindings", "events", "formField", "ssr", "pdf"])).optional(),
-  controlled: ui.optional(),
+  controlled: pi.optional(),
   css: t.array(t.string()).optional()
 }).strict(), Aa = t.object({
   $schema: t.string().optional(),
@@ -4754,12 +4758,12 @@ const ui = t.object({
     name: t.literal("bonsai"),
     api: t.string().min(1)
   }).strict(),
-  components: t.array(pi).min(1),
+  components: t.array(mi).min(1),
   integrity: t.object({
     algorithm: t.literal("sha256"),
     manifestHash: t.string().min(1)
   }).strict().optional()
-}).strict(), mi = "1", Yt = {
+}).strict(), gi = "1", Yt = {
   identity: (e) => e,
   targetValue: (e) => e?.target?.value,
   targetChecked: (e) => e?.target?.checked,
@@ -4770,7 +4774,7 @@ class H extends Error {
     super(a), this.name = "ManifestLoadError";
   }
 }
-function gi(e, a) {
+function hi(e, a) {
   return e ? a ? t.any().superRefine((r, n) => {
     const o = e.safeParse(r);
     if (!o.success)
@@ -4782,11 +4786,11 @@ function gi(e, a) {
         n.addIssue({ code: "custom", message: l.message, path: l.path });
   }) : e : a;
 }
-async function hi(e) {
+async function fi(e) {
   const a = new TextEncoder().encode(e), r = await crypto.subtle.digest("SHA-256", a);
   return `sha256:${Array.from(new Uint8Array(r)).map((o) => o.toString(16).padStart(2, "0")).join("")}`;
 }
-function fi(e) {
+function bi(e) {
   const a = Yt[e];
   if (!a)
     throw new H(
@@ -4794,7 +4798,7 @@ function fi(e) {
     );
   return a;
 }
-function bi(e, a, r) {
+function xi(e, a, r) {
   const n = a.components[e.entry];
   if (!n)
     throw new H(
@@ -4803,21 +4807,21 @@ function bi(e, a, r) {
   const o = e.propsSchema ? ve(e.propsSchema) : void 0, s = e.controlled ? {
     valueProp: e.controlled.valueProp,
     changeProp: e.controlled.changeProp,
-    extract: fi(e.controlled.extract)
+    extract: bi(e.controlled.extract)
   } : n.controlled;
   return [
     e.canonicalName ?? e.name,
     {
       component: n.component,
-      propsSchema: gi(n.propsSchema, o),
+      propsSchema: hi(n.propsSchema, o),
       capabilities: e.capabilities ?? n.capabilities,
       controlled: s,
       assets: e.css ? { css: e.css } : n.assets
     }
   ];
 }
-function xi(e, a) {
-  const r = Aa.parse(e), n = a.engineApi ?? mi;
+function vi(e, a) {
+  const r = Aa.parse(e), n = a.engineApi ?? gi;
   if (r.engine.api !== n)
     throw new H(
       `Registry manifest "${r.id}" targets engine.api "${r.engine.api}", but this build supports "${n}"`
@@ -4833,7 +4837,7 @@ function xi(e, a) {
       `Registry manifest "${r.id}" is ${a.rawManifestSize} bytes, exceeding the limit of ${s}`
     );
   const l = Object.fromEntries(
-    r.components.map((u) => bi(u, a.base, r.id))
+    r.components.map((u) => xi(u, a.base, r.id))
   );
   return {
     id: r.id,
@@ -4845,10 +4849,10 @@ function xi(e, a) {
   };
 }
 const ye = /* @__PURE__ */ new Map();
-function es() {
+function ts() {
   ye.clear();
 }
-function vi(e, a) {
+function yi(e, a) {
   if (!e.integrity)
     throw new H(
       `Registry manifest "${e.id}" has no integrity block — a manifest hash is required before use`
@@ -4858,7 +4862,7 @@ function vi(e, a) {
       `Registry manifest "${e.id}" failed its integrity check: expected "${e.integrity.manifestHash}", computed "${a}"`
     );
 }
-async function ts(e, a) {
+async function as(e, a) {
   let r;
   if (typeof e == "string") {
     const m = new URL(e);
@@ -4874,18 +4878,18 @@ async function ts(e, a) {
     r = await v.text();
   } else
     r = JSON.stringify(e);
-  const n = Aa.parse(JSON.parse(r)), { integrity: o, ...s } = n, l = await hi(JSON.stringify(s));
-  vi(n, l);
+  const n = Aa.parse(JSON.parse(r)), { integrity: o, ...s } = n, l = await fi(JSON.stringify(s));
+  yi(n, l);
   const u = ye.get(l);
   if (u) return u;
-  const p = xi(n, { ...a, rawManifestSize: r.length, manifestHash: l });
+  const p = vi(n, { ...a, rawManifestSize: r.length, manifestHash: l });
   return ye.set(l, p), p;
 }
-function as(e, a) {
+function rs(e, a) {
   const r = { ...e?.properties ?? {}, ...a?.properties ?? {} }, n = [.../* @__PURE__ */ new Set([...e?.required ?? [], ...a?.required ?? []])];
   return { type: "object", properties: r, required: n };
 }
-function yi(e, a) {
+function wi(e, a) {
   const r = new Map(e.map((s) => [s.url, s.registryHash])), n = new Map(a.map((s) => [s.url, s.registryHash])), o = [];
   for (const [s, l] of n) {
     const u = r.get(s);
@@ -4899,8 +4903,8 @@ function Kt(e) {
   const a = /(\d+)\.\d+\.\d+/.exec(e);
   return a ? Number(a[1]) : void 0;
 }
-function rs(e) {
-  const a = [], r = yi(e.artifactRegistries, e.configRegistries);
+function ns(e) {
+  const a = [], r = wi(e.artifactRegistries, e.configRegistries);
   if (r && a.push({
     check: "stale-artifact",
     level: "fail",
@@ -4915,31 +4919,31 @@ function rs(e) {
   }
   return a;
 }
-function ns(e) {
+function os(e) {
   const a = e.filter((r) => r.level === "fail");
   if (a.length > 0)
     throw new Error(a.map((r) => r.message).join("; "));
 }
 export {
-  Zi as Bonsai,
+  Qi as Bonsai,
   Yt as EXTRACTOR_ALLOWLIST,
   H as ManifestLoadError,
   Aa as RegistryManifestSchema,
-  ns as assertNoFailingDrift,
-  rs as checkArtifactDrift,
-  es as clearManifestCache,
+  os as assertNoFailingDrift,
+  ns as checkArtifactDrift,
+  ts as clearManifestCache,
   Mt as componentMap,
-  gi as composePropsSchema,
-  hi as computeManifestHash,
+  hi as composePropsSchema,
+  fi as computeManifestHash,
   Uo as controlledInputMap,
-  Ki as defineBonsaiRegistry,
-  Yi as defineComponent,
+  Zi as defineBonsaiRegistry,
+  Ki as defineComponent,
   ve as jsonSchemaToZod,
-  ts as loadRegistryManifest,
-  as as mergeGeneratedWithOverrides,
+  as as loadRegistryManifest,
+  rs as mergeGeneratedWithOverrides,
   Ce as pebbleRegistry,
-  xi as resolveManifest,
+  vi as resolveManifest,
   di as resolveRegistryPin,
   Ko as useUpdateData,
-  Qi as validateTemplate
+  es as validateTemplate
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pebble-software/bonsai",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/PebbleSoftwareInc/pebble-bonsai.git"