ovr 7.0.0-next.0 → 7.0.0-next.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../src/auth/configure.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAe,MAAM,kBAAkB,CAAC;AAItD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,EAC7C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EACxB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,KAAK,KAAK;;;;;;;;;;;;IA6MjC,2FAA2F;aAEvF,IAAI,CAAC,OAAO,UACR;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GACvB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;EA+C9B"}
1
+ {"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../src/auth/configure.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAe,MAAM,kBAAkB,CAAC;AAItD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,EAC7C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EACxB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,KAAK,KAAK;;;;;;;;;;;;IA6MjC,2FAA2F;aAEvF,IAAI,CAAC,OAAO,UACR;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GACvB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;EAmD9B"}
@@ -186,6 +186,11 @@ export function configure(options, storage, state) {
186
186
  /** Create forms in the handler before returning JSX, so ovr can set the binding cookie. */
187
187
  forms(c, props = {}) {
188
188
  const passkey = new Passkey(c, state(c));
189
+ // the page that sent the user here, such as /login?_return=/recipes/1,
190
+ // is where they go after logging in
191
+ const back = c.url.searchParams.get(Form.params[0]);
192
+ if (back)
193
+ state(c).remember(back);
189
194
  const Register = passkey.form(register, "register", {
190
195
  ...props,
191
196
  endpoint: registration.url(),
@@ -27,7 +27,8 @@ export declare class State {
27
27
  session(): Promise<ContextType.Session | null>;
28
28
  /**
29
29
  * Return to a local path after the next login, such as an agent's
30
- * authorization request.
30
+ * authorization request, or the page that sent the user to log in. Any
31
+ * other path is ignored.
31
32
  *
32
33
  * @param path Local path with its query
33
34
  */
@@ -1 +1 @@
1
- {"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/auth/state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,IAAI,WAAW,EAAS,MAAM,qBAAqB,CAAC;AAEzE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,yBAAiB,KAAK,CAAC;IACtB,oFAAoF;IACpF,KAAY,OAAO,GAAG,IAAI,CACzB,IAAI,CAAC,OAAO,EACZ,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CACzC,GACA,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,UAAU,CAAC,CAAC;IAC1C,2EAA2E;IAC3E,KAAY,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,CAAC,CAAC;CACnE;AAED,yEAAyE;AACzE,qBAAa,KAAK;;IAQjB,+CAA+C;IAC/C,QAAQ,CAAC,OAAO;;;;;;;MAAC;IAEjB,6DAA6D;IAC7D,YAAY,CAAC,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EASnD;IAeD,oFAAoF;IACpF,OAAO,CAAC,MAAM,UAAQ,sBAQrB;IA+ED,6EAA6E;IAC7E,OAAO,wCAEN;IAED;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,QAKpB;IAED;;;OAGG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,UAYtB;IAED,yEAAyE;IACnE,KAAK,CAAC,IAAI,EAAE,MAAM;;;;OAqBvB;IAED,kFAAkF;IAC5E,MAAM,kBAOX;CACD"}
1
+ {"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/auth/state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,IAAI,WAAW,EAAS,MAAM,qBAAqB,CAAC;AAEzE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAG5C,yBAAiB,KAAK,CAAC;IACtB,oFAAoF;IACpF,KAAY,OAAO,GAAG,IAAI,CACzB,IAAI,CAAC,OAAO,EACZ,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CACzC,GACA,IAAI,CAAC,OAAO,EAAE,YAAY,GAAG,UAAU,CAAC,CAAC;IAC1C,2EAA2E;IAC3E,KAAY,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,CAAC,CAAC;CACnE;AAED,yEAAyE;AACzE,qBAAa,KAAK;;IAQjB,+CAA+C;IAC/C,QAAQ,CAAC,OAAO;;;;;;;MAAC;IAEjB,6DAA6D;IAC7D,YAAY,CAAC,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EASnD;IAeD,oFAAoF;IACpF,OAAO,CAAC,MAAM,UAAQ,sBAQrB;IA+ED,6EAA6E;IAC7E,OAAO,wCAEN;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,QAMpB;IAED;;;OAGG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,UAQtB;IAgBD,yEAAyE;IACnE,KAAK,CAAC,IAAI,EAAE,MAAM;;;;OAqBvB;IAED,kFAAkF;IAC5E,MAAM,kBAOX;CACD"}
@@ -124,12 +124,15 @@ export class State {
124
124
  }
125
125
  /**
126
126
  * Return to a local path after the next login, such as an agent's
127
- * authorization request.
127
+ * authorization request, or the page that sent the user to log in. Any
128
+ * other path is ignored.
128
129
  *
129
130
  * @param path Local path with its query
130
131
  */
131
132
  remember(path) {
132
133
  this.#origin();
134
+ if (!State.#local(path))
135
+ return;
133
136
  this.#set(State.#return, path, {
134
137
  maxAge: Math.floor((15 * Time.minute) / Time.second),
135
138
  });
@@ -144,11 +147,18 @@ export class State {
144
147
  if (!path)
145
148
  return fallback;
146
149
  this.#set(State.#return, "", { maxAge: 0 });
147
- return path.startsWith("/") &&
150
+ return State.#local(path) ? path : fallback;
151
+ }
152
+ /**
153
+ * @param path Path from a request or a cookie
154
+ * @returns `true` for a path of this origin, which a browser cannot read as
155
+ * another host, short enough for a cookie
156
+ */
157
+ static #local(path) {
158
+ return (path.startsWith("/") &&
148
159
  !path.startsWith("//") &&
149
- !path.includes("\\")
150
- ? path
151
- : fallback;
160
+ !path.includes("\\") &&
161
+ path.length <= 2048);
152
162
  }
153
163
  /** Replace the current session and issue a new signed, secure cookie. */
154
164
  async login(user) {
@@ -71,6 +71,8 @@ export declare class Form<Shape extends Field.Shape = Field.Shape> {
71
71
  Fields: ({ values, ...props }?: // partial because name is not required
72
72
  Partial<Field.Component.Props<Shape>> & {
73
73
  values?: Field.Value.Initial<Shape> | undefined;
74
+ /** Each field's own: give them to its `Field` or `component` */
75
+ options?: never;
74
76
  }) => JSX.Element[];
75
77
  /**
76
78
  * Access bound sub-components for a field.
@@ -397,6 +399,13 @@ export declare namespace Field {
397
399
  type Props<S extends Field.Shape, I extends boolean = true> = {
398
400
  /** Field name attribute */
399
401
  readonly name: ShapeUtil.Name<S>;
402
+ /**
403
+ * Choices of a checkbox group, radio group, or select made from a
404
+ * schema, such as `Field.checkboxes(Schema.string().uuid())`, known
405
+ * as the form renders. Each is shown as its value unless a custom
406
+ * layout labels it.
407
+ */
408
+ readonly options?: readonly string[] | undefined;
400
409
  /** Form state */
401
410
  readonly state?: (I extends true ? URL : Field.State<S>) | undefined;
402
411
  } & Field.Props;
@@ -673,27 +682,35 @@ export declare class Field {
673
682
  */
674
683
  static file(): Field.Instance<File, "input", "file">;
675
684
  /**
685
+ * A group of checkboxes, of fixed choices or of choices a schema checks,
686
+ * which are given as the form renders:
687
+ *
688
+ * ```tsx
689
+ * Field.checkboxes(["fall", "winter"]);
690
+ * Field.checkboxes(Schema.string().uuid()); // <form.Field name="photos" options={ids} />
691
+ * ```
692
+ *
676
693
  * @template V Value type
677
- * @param options Checkbox options
694
+ * @param options Checkbox options, or a schema for each one
678
695
  * @returns Checkbox group input field
679
696
  */
680
- static checkboxes<const V extends string>(options: readonly [V, ...V[]]): Field.Instance<V[], "input", "checkbox", readonly [V, ...V[]]>;
697
+ static checkboxes<const V extends string>(options: readonly [V, ...V[]] | Schema<V>): Field.Instance<V[], "input", "checkbox", readonly [V, ...V[]]>;
681
698
  /**
682
699
  * @template V Value type
683
- * @param options Radio button options
700
+ * @param options Radio button options, or a schema for the one chosen
684
701
  * @returns Radio group input field
685
702
  */
686
- static radio<const V extends string>(options: readonly [V, ...V[]]): Field.Instance<V, "input", "radio", readonly [V, ...V[]]>;
703
+ static radio<const V extends string>(options: readonly [V, ...V[]] | Schema<V>): Field.Instance<V, "input", "radio", readonly [V, ...V[]]>;
687
704
  /**
688
705
  * @returns Textarea field
689
706
  */
690
707
  static textarea(): Field.Instance<string, "textarea">;
691
708
  /**
692
709
  * @template V Value type
693
- * @param options Select options
710
+ * @param options Select options, or a schema for the one chosen
694
711
  * @returns Select field
695
712
  */
696
- static select<const V extends string>(options: readonly [V, ...V[]]): Field.Instance<V, "select", Field.Type, readonly [V, ...V[]]>;
713
+ static select<const V extends string>(options: readonly [V, ...V[]] | Schema<V>): Field.Instance<V, "select", Field.Type, readonly [V, ...V[]]>;
697
714
  }
698
715
  export {};
699
716
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/form/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/form/index.ts"],"names":[],"mappings":"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"}
@@ -558,7 +558,7 @@ class FieldSchema extends Schema {
558
558
  const files = data.getAll(name).filter(chosenFile);
559
559
  return files.length ? files : undefined;
560
560
  }
561
- : readMany, file ? Infinity : this.options.length, this.streaming, this.#persist);
561
+ : readMany, file ? Infinity : this.options.length || Infinity, this.streaming, this.#persist);
562
562
  }
563
563
  persist() {
564
564
  return this.#copy({ persist: true });
@@ -573,7 +573,17 @@ class FieldSchema extends Schema {
573
573
  derive(def) {
574
574
  return this.#copy({ def });
575
575
  }
576
- [component]({ state, ...props }) {
576
+ /**
577
+ * @param given Options given as the form renders
578
+ * @returns The field's own choices, those given for a field made from a
579
+ * schema, or `undefined` for a field without choices
580
+ */
581
+ #options(given) {
582
+ const { options } = this;
583
+ return options && (options.length ? options : (given ?? []));
584
+ }
585
+ [component]({ state, options: given, ...props }) {
586
+ const options = this.#options(given);
577
587
  const value = state?.values?.[props.name];
578
588
  const issue = state?.issues?.find((i) => i.path[0] === props.name);
579
589
  const issueId = issue && `${props.name}-issue`;
@@ -613,7 +623,7 @@ class FieldSchema extends Schema {
613
623
  "data-issue": issue && state.issues.indexOf(issue), // issue index starting from 0
614
624
  ...data,
615
625
  });
616
- if (this.options && this.tag !== "select") {
626
+ if (options && this.tag !== "select") {
617
627
  // radio/checkboxes
618
628
  // make multiple ids for the group so all don't have the same id
619
629
  const groupId = (value) => `${control.name}-${value}`.toLowerCase();
@@ -621,7 +631,7 @@ class FieldSchema extends Schema {
621
631
  ...control,
622
632
  id: groupId(data.value),
623
633
  // autofocus only the first input in the group
624
- autofocus: control.autofocus && data.value === this.options?.[0],
634
+ autofocus: control.autofocus && data.value === options[0],
625
635
  checked: chosen(data.value),
626
636
  ...data,
627
637
  });
@@ -638,6 +648,7 @@ class FieldSchema extends Schema {
638
648
  }),
639
649
  Legend: (data = {}) => jsx("legend", { children: label, ...data }),
640
650
  ...this,
651
+ options,
641
652
  };
642
653
  }
643
654
  return {
@@ -664,13 +675,14 @@ class FieldSchema extends Schema {
664
675
  },
665
676
  Option:
666
677
  // select
667
- this.options &&
678
+ options &&
668
679
  ((data) => jsx("option", {
669
680
  children: data.value,
670
681
  selected: chosen(data.value),
671
682
  ...data,
672
683
  })),
673
684
  ...this,
685
+ options,
674
686
  };
675
687
  }
676
688
  /**
@@ -681,7 +693,7 @@ class FieldSchema extends Schema {
681
693
  [render](props) {
682
694
  // the sub-components of each kind of field, told apart by `options` and `tag` below
683
695
  const c = this[component](props);
684
- const { options } = this;
696
+ const options = this.#options(props.options);
685
697
  return c.Root({
686
698
  children: [
687
699
  options && this.tag !== "select"
@@ -869,20 +881,41 @@ export class Field {
869
881
  });
870
882
  }
871
883
  /**
884
+ * @param options The choices, or a schema that checks each one when they
885
+ * are only known as the form renders, such as a record's own IDs
886
+ * @returns Fixed choices, and the schema that checks one, when given a list
887
+ */
888
+ static #choices(options) {
889
+ return options instanceof Schema
890
+ ? // given to `Field` or `component` as the form renders
891
+ [[], options]
892
+ : [options, Schema.enum(options, choose)];
893
+ }
894
+ /**
895
+ * A group of checkboxes, of fixed choices or of choices a schema checks,
896
+ * which are given as the form renders:
897
+ *
898
+ * ```tsx
899
+ * Field.checkboxes(["fall", "winter"]);
900
+ * Field.checkboxes(Schema.string().uuid()); // <form.Field name="photos" options={ids} />
901
+ * ```
902
+ *
872
903
  * @template V Value type
873
- * @param options Checkbox options
904
+ * @param options Checkbox options, or a schema for each one
874
905
  * @returns Checkbox group input field
875
906
  */
876
907
  static checkboxes(options) {
877
- return new FieldSchema({ options, props: { type: "checkbox" } }, Schema.array(Schema.enum(options, choose), choose), readMany, options.length);
908
+ const [values, choice] = Field.#choices(options);
909
+ return new FieldSchema({ options: values, props: { type: "checkbox" } }, Schema.array(choice, choose), readMany, values.length || Infinity);
878
910
  }
879
911
  /**
880
912
  * @template V Value type
881
- * @param options Radio button options
913
+ * @param options Radio button options, or a schema for the one chosen
882
914
  * @returns Radio group input field
883
915
  */
884
916
  static radio(options) {
885
- return new FieldSchema({ options, props: { type: "radio" } }, Schema.enum(options, choose));
917
+ const [values, choice] = Field.#choices(options);
918
+ return new FieldSchema({ options: values, props: { type: "radio" } }, choice);
886
919
  }
887
920
  /**
888
921
  * @returns Textarea field
@@ -892,10 +925,11 @@ export class Field {
892
925
  }
893
926
  /**
894
927
  * @template V Value type
895
- * @param options Select options
928
+ * @param options Select options, or a schema for the one chosen
896
929
  * @returns Select field
897
930
  */
898
931
  static select(options) {
899
- return new FieldSchema({ tag: "select", options }, Schema.enum(options, choose));
932
+ const [values, choice] = Field.#choices(options);
933
+ return new FieldSchema({ tag: "select", options: values }, choice);
900
934
  }
901
935
  }
@@ -1,4 +1,5 @@
1
1
  import type { JSX } from "../jsx/index.js";
2
+ import { type Markup } from "../markup/index.js";
2
3
  /** Internal protocol for the MCP endpoint, to write a form as its tool's call. */
3
4
  export declare const tools: unique symbol;
4
5
  export declare namespace Markdown {
@@ -57,5 +58,19 @@ export declare class Markdown {
57
58
  * @returns Concatenated Markdown
58
59
  */
59
60
  static string(element: JSX.Element, options?: Markdown.Options): Promise<string>;
61
+ /**
62
+ * Markdown source with the HTML it renders to, such as steps written in
63
+ * Markdown. Pages show the HTML, and agents reading the page as Markdown
64
+ * get the source. Neither is escaped, so both must be safe.
65
+ *
66
+ * ```tsx
67
+ * <section>{Markdown.raw(recipe.steps, render(recipe.steps))}</section>
68
+ * ```
69
+ *
70
+ * @param markdown Markdown source
71
+ * @param html Safe HTML it renders to
72
+ * @returns New _safe_ chunk
73
+ */
74
+ static raw(markdown: unknown, html: unknown): Markup.Chunk;
60
75
  }
61
76
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/markdown/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AA0C3C,kFAAkF;AAClF,eAAO,MAAM,KAAK,eAAkB,CAAC;AAErC,yBAAiB,QAAQ,CAAC;IACzB,kCAAkC;IAClC,KAAY,OAAO,GAAG;QACrB,wEAAwE;QACxE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC;QAEzC;;;;;;;;;WASG;QACH,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EACd,CAAC,CACD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,GAAG,KACN;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;SAAE,GAAG,SAAS,CAAC,GAChE,SAAS,CAAC;KACb,CAAC;CACF;AA4pCD;;;;;;;;;GASG;AACH,qBAAa,QAAQ;;IAOpB;;;;;OAKG;IACH,YAAY,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,EAG3D;IAED,+CAA+C;IACxC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAWrE;IAED;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,+CAE7D;IAED;;;;;;OAMG;IACH,OAAa,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,mBAcnE;CACD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/markdown/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAEN,KAAK,MAAM,EAKX,MAAM,oBAAoB,CAAC;AAyC5B,kFAAkF;AAClF,eAAO,MAAM,KAAK,eAAkB,CAAC;AAErC,yBAAiB,QAAQ,CAAC;IACzB,kCAAkC;IAClC,KAAY,OAAO,GAAG;QACrB,wEAAwE;QACxE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC;QAEzC;;;;;;;;;WASG;QACH,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EACd,CAAC,CACD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,GAAG,KACN;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;SAAE,GAAG,SAAS,CAAC,GAChE,SAAS,CAAC;KACb,CAAC;CACF;AAgqCD;;;;;;;;;GASG;AACH,qBAAa,QAAQ;;IAOpB;;;;;OAKG;IACH,YAAY,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,EAG3D;IAED,+CAA+C;IACxC,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAWrE;IAED;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,+CAE7D;IAED;;;;;;OAMG;IACH,OAAa,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,mBAcnE;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC,KAAK,CAEzD;CACD"}
@@ -1,4 +1,4 @@
1
- import { Group, Render, Tag, readable } from "../markup/index.js";
1
+ import { Group, Render, Source, Tag, readable, } from "../markup/index.js";
2
2
  /** Internal protocol for the MCP endpoint, to write a form as its tool's call. */
3
3
  export const tools = Symbol("tools");
4
4
  /** Writes Markdown from rendered chunks, one block at a time */
@@ -130,6 +130,8 @@ class Writer {
130
130
  if (chunk.closed)
131
131
  this.#close(chunk.name);
132
132
  }
133
+ else if (chunk instanceof Source)
134
+ this.#raw(chunk.markdown, true);
133
135
  else if (chunk.raw)
134
136
  this.#raw(chunk.value);
135
137
  else
@@ -154,14 +156,16 @@ class Writer {
154
156
  }
155
157
  /**
156
158
  * Raw HTML, such as from `Markup.raw`, is valid Markdown, so it is
157
- * written as it is.
159
+ * written as it is, as is Markdown source from `Markdown.raw`, which is
160
+ * always its own block.
158
161
  *
159
- * @param html HTML
162
+ * @param html HTML, or Markdown source
163
+ * @param source The text is Markdown source
160
164
  */
161
- #raw(html) {
165
+ #raw(html, source) {
162
166
  if (!html || this.#skipping)
163
167
  return;
164
- const node = Writer.#node("!", {}, html);
168
+ const node = Writer.#node("!", source ? { source: "" } : {}, html);
165
169
  const parent = this.#stack.at(-1);
166
170
  if (parent)
167
171
  parent.children.push(node);
@@ -916,7 +920,8 @@ class Writer {
916
920
  */
917
921
  static #isBlock(node) {
918
922
  return node.tag === "!"
919
- ? Writer.#rawBlock.test(node.children[0])
923
+ ? "source" in node.attrs ||
924
+ Writer.#rawBlock.test(node.children[0])
920
925
  : Writer.#blockTags.has(node.tag);
921
926
  }
922
927
  /**
@@ -1157,4 +1162,20 @@ export class Markdown {
1157
1162
  }
1158
1163
  return markdown;
1159
1164
  }
1165
+ /**
1166
+ * Markdown source with the HTML it renders to, such as steps written in
1167
+ * Markdown. Pages show the HTML, and agents reading the page as Markdown
1168
+ * get the source. Neither is escaped, so both must be safe.
1169
+ *
1170
+ * ```tsx
1171
+ * <section>{Markdown.raw(recipe.steps, render(recipe.steps))}</section>
1172
+ * ```
1173
+ *
1174
+ * @param markdown Markdown source
1175
+ * @param html Safe HTML it renders to
1176
+ * @returns New _safe_ chunk
1177
+ */
1178
+ static raw(markdown, html) {
1179
+ return new Source(markdown, html);
1180
+ }
1160
1181
  }
@@ -37,6 +37,19 @@ export declare class Tag extends Chunk {
37
37
  /** @returns The tag's markup, built when it is written */
38
38
  toString(): string;
39
39
  }
40
+ /**
41
+ * Markup with its Markdown source, from `Markdown.raw`, internal to ovr. It
42
+ * is written as its markup, and as its source in Markdown.
43
+ */
44
+ export declare class Source extends Chunk {
45
+ /** Markdown source */
46
+ readonly markdown: string;
47
+ /**
48
+ * @param markdown Markdown source
49
+ * @param html Safe markup it renders to
50
+ */
51
+ constructor(markdown: unknown, html: unknown);
52
+ }
40
53
  /**
41
54
  * Chunks a later sibling rendered while an earlier one was still rendering,
42
55
  * yielded together once they are next. Internal to ovr.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/markup/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/markup/index.ts"],"names":[],"mappings":"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"}
@@ -75,6 +75,22 @@ export class Tag extends Chunk {
75
75
  : `<${opening}>`;
76
76
  }
77
77
  }
78
+ /**
79
+ * Markup with its Markdown source, from `Markdown.raw`, internal to ovr. It
80
+ * is written as its markup, and as its source in Markdown.
81
+ */
82
+ export class Source extends Chunk {
83
+ /** Markdown source */
84
+ markdown;
85
+ /**
86
+ * @param markdown Markdown source
87
+ * @param html Safe markup it renders to
88
+ */
89
+ constructor(markdown, html) {
90
+ super(html, true);
91
+ this.markdown = String(markdown ?? "");
92
+ }
93
+ }
78
94
  /**
79
95
  * Chunks a later sibling rendered while an earlier one was still rendering,
80
96
  * yielded together once they are next. Internal to ovr.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,EAAU,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,KAAK,OAAO,EAAS,MAAM,qBAAqB,CAAC;AAG1D,OAAO,EAAE,KAAK,EAAuB,MAAM,mBAAmB,CAAC;AAmC/D,yBAAiB,GAAG,CAAC;IACpB;;;;OAIG;IACH,KAAY,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;QAChD;;;;WAIG;QACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAEvB,gDAAgD;QAChD,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAE/B;;;;WAIG;QACH,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE9B;;;;WAIG;QACH,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC;KACzB,CAAC;IAEF,gEAAgE;IAChE,UAAiB,IAAI;QACpB,qEAAqE;QACrE,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE;YAClB,yCAAyC;YACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;YAExB;;;;eAIG;YACH,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;YAEpE;;;;eAIG;YACH,KAAK,CACJ,GAAG,EAAE,GAAG,CAAC,KAAK,EACd,QAAQ,EAAE,MAAM,GACd,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;SACzC,CAAC;KACF;CACD;AAED;;;;;;;GAOG;AACH,qBAAa,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;;IA8CzC,wCAAwC;IACxC,YAAY,OAAO,GAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAM,EAEvC;IAED;;;;;OAKG;IACH,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,CAAC,CAAC,CAgD7D;CA0hCD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,EAAU,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,KAAK,OAAO,EAAS,MAAM,qBAAqB,CAAC;AAG1D,OAAO,EAAE,KAAK,EAAuB,MAAM,mBAAmB,CAAC;AAmC/D,yBAAiB,GAAG,CAAC;IACpB;;;;OAIG;IACH,KAAY,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI;QAChD;;;;WAIG;QACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAEvB,gDAAgD;QAChD,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAE/B;;;;WAIG;QACH,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE9B;;;;WAIG;QACH,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC;KACzB,CAAC;IAEF,gEAAgE;IAChE,UAAiB,IAAI;QACpB,qEAAqE;QACrE,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE;YAClB,yCAAyC;YACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;YAExB;;;;eAIG;YACH,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;YAEpE;;;;eAIG;YACH,KAAK,CACJ,GAAG,EAAE,GAAG,CAAC,KAAK,EACd,QAAQ,EAAE,MAAM,GACd,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;SACzC,CAAC;KACF;CACD;AAED;;;;;;;GAOG;AACH,qBAAa,GAAG,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM;;IA8CzC,wCAAwC;IACxC,YAAY,OAAO,GAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAM,EAEvC;IAED;;;;;OAKG;IACH,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,CAAC,CAAC,CAgD7D;CAwlCD"}
package/dist/mcp/index.js CHANGED
@@ -272,7 +272,9 @@ export class Mcp {
272
272
  const length = Number(c.req.headers.get("content-length"));
273
273
  const text = length > limit ? undefined : await Mcp.#text(c.req.body, limit);
274
274
  if (text === undefined)
275
- throw new RpcError(-32600, "Request too large", 413);
275
+ // the limit, so an agent knows how far to shrink a file, which base64
276
+ // makes about a third larger
277
+ throw new RpcError(-32600, `Request too large: at most ${Mcp.#size(limit)}, with files sent as base64, about a third larger than the file`, 413, { limit });
276
278
  const invalid = () => new RpcError(-32700, "Parse error", 400);
277
279
  if (text === null)
278
280
  throw invalid();
@@ -486,14 +488,30 @@ export class Mcp {
486
488
  Object.assign(properties, schema.properties);
487
489
  for (const field of (schema.required ?? []))
488
490
  required.add(field);
489
- // a tool's arguments are JSON, so a file is sent as its contents
491
+ // a tool's arguments are JSON, so a file is sent as its contents,
492
+ // and a JSON field as the value it parses, not a string of it
490
493
  for (const name in shape) {
491
494
  const field = shape[name];
495
+ const property = properties[name];
492
496
  if (field.type === "file")
493
- properties[name] = {
494
- ...properties[name],
495
- ...(field.parts > 1 ? { items: Mcp.#file } : Mcp.#file),
496
- };
497
+ properties[name] =
498
+ field.parts > 1
499
+ ? { ...property, items: Mcp.#file }
500
+ : {
501
+ ...property,
502
+ ...Mcp.#file,
503
+ // the field's own, such as a size limit, then how to send it
504
+ description: [
505
+ property.description?.replace(/\.$/, ""),
506
+ Mcp.#file.description,
507
+ ]
508
+ .filter(Boolean)
509
+ .join(". "),
510
+ };
511
+ else if (Mcp.#whole(field)) {
512
+ const { type: _, contentMediaType: __, contentSchema, ...keywords } = properties[name];
513
+ properties[name] = { ...contentSchema, ...keywords };
514
+ }
497
515
  }
498
516
  }
499
517
  for (const [param, key] of Mcp.#params(route)) {
@@ -539,6 +557,26 @@ export class Mcp {
539
557
  },
540
558
  required: ["name"],
541
559
  };
560
+ /**
561
+ * @param bytes Size in bytes
562
+ * @returns The size to read, such as `4 MB`
563
+ */
564
+ static #size(bytes) {
565
+ return bytes >= Size.mb
566
+ ? `${+(bytes / Size.mb).toFixed(1)} MB`
567
+ : `${Math.ceil(bytes / Size.kb)} KB`;
568
+ }
569
+ /**
570
+ * @param field Form field
571
+ * @returns `true` for a field that parses its one value as JSON, such as
572
+ * `Field.textarea().json(schema)`, also when made optional
573
+ */
574
+ static #whole(field) {
575
+ let def = field.def;
576
+ while (def && def.type !== "json")
577
+ def = "inner" in def ? def.inner.def : undefined;
578
+ return Boolean(def);
579
+ }
542
580
  /**
543
581
  * @param value Tool argument for a file field
544
582
  * @returns The file, `undefined` when the argument does not describe one
@@ -649,6 +687,17 @@ export class Mcp {
649
687
  if (pathParams.has(name) && !field)
650
688
  continue;
651
689
  const upload = !read && field?.type === "file";
690
+ // a JSON field reads one value, so an array is sent whole, as its
691
+ // input schema describes it
692
+ const whole = field && Mcp.#whole(field);
693
+ if (whole && value != null) {
694
+ const text = JSON.stringify(value);
695
+ if (read)
696
+ url.searchParams.append(name, text);
697
+ else
698
+ body.append(name, text);
699
+ continue;
700
+ }
652
701
  for (const item of Array.isArray(value) ? value : [value]) {
653
702
  if (item == null || item === false)
654
703
  continue;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ovr",
3
3
  "description": "Web apps anyone can use. Each route serves people a page and agents Markdown and MCP tools, with forms, Postgres, and passkey sign-in built in.",
4
- "version": "7.0.0-next.0",
4
+ "version": "7.0.0-next.2",
5
5
  "license": "MIT",
6
6
  "repository": {
7
7
  "type": "git",
@@ -231,6 +231,10 @@ export function configure<U extends Auth.Users>(
231
231
  props: { nonce?: string } = {},
232
232
  ): Auth.Forms<Auth.Fields<U>> {
233
233
  const passkey = new Passkey(c, state(c));
234
+ // the page that sent the user here, such as /login?_return=/recipes/1,
235
+ // is where they go after logging in
236
+ const back = c.url.searchParams.get(Form.params[0]);
237
+ if (back) state(c).remember(back);
234
238
  const Register = passkey.form(register, "register", {
235
239
  ...props,
236
240
  endpoint: registration.url(),
package/src/auth/state.ts CHANGED
@@ -148,12 +148,14 @@ export class State {
148
148
 
149
149
  /**
150
150
  * Return to a local path after the next login, such as an agent's
151
- * authorization request.
151
+ * authorization request, or the page that sent the user to log in. Any
152
+ * other path is ignored.
152
153
  *
153
154
  * @param path Local path with its query
154
155
  */
155
156
  remember(path: string) {
156
157
  this.#origin();
158
+ if (!State.#local(path)) return;
157
159
  this.#set(State.#return, path, {
158
160
  maxAge: Math.floor((15 * Time.minute) / Time.second),
159
161
  });
@@ -170,11 +172,21 @@ export class State {
170
172
 
171
173
  this.#set(State.#return, "", { maxAge: 0 });
172
174
 
173
- return path.startsWith("/") &&
175
+ return State.#local(path) ? path : fallback;
176
+ }
177
+
178
+ /**
179
+ * @param path Path from a request or a cookie
180
+ * @returns `true` for a path of this origin, which a browser cannot read as
181
+ * another host, short enough for a cookie
182
+ */
183
+ static #local(path: string) {
184
+ return (
185
+ path.startsWith("/") &&
174
186
  !path.startsWith("//") &&
175
- !path.includes("\\")
176
- ? path
177
- : fallback;
187
+ !path.includes("\\") &&
188
+ path.length <= 2048
189
+ );
178
190
  }
179
191
 
180
192
  /** Replace the current session and issue a new signed, secure cookie. */
package/src/form/index.ts CHANGED
@@ -451,6 +451,8 @@ export class Form<Shape extends Field.Shape = Field.Shape> {
451
451
  }: // partial because name is not required
452
452
  Partial<Field.Component.Props<Shape>> & {
453
453
  values?: Field.Value.Initial<Shape> | undefined;
454
+ /** Each field's own: give them to its `Field` or `component` */
455
+ options?: never;
454
456
  } = {}) => {
455
457
  const state = this.#decode(props.state, values); // pulled out to not call each map iteration
456
458
 
@@ -771,7 +773,7 @@ class FieldSchema<
771
773
  return files.length ? files : undefined;
772
774
  }
773
775
  : readMany,
774
- file ? Infinity : this.options!.length,
776
+ file ? Infinity : this.options!.length || Infinity,
775
777
  this.streaming,
776
778
  this.#persist,
777
779
  );
@@ -808,6 +810,16 @@ class FieldSchema<
808
810
  return this.#copy<O>({ def });
809
811
  }
810
812
 
813
+ /**
814
+ * @param given Options given as the form renders
815
+ * @returns The field's own choices, those given for a field made from a
816
+ * schema, or `undefined` for a field without choices
817
+ */
818
+ #options(given: readonly string[] | undefined) {
819
+ const { options } = this;
820
+ return options && (options.length ? options : (given ?? []));
821
+ }
822
+
811
823
  /**
812
824
  * @template S Form shape type
813
825
  * @param props Field control props
@@ -818,8 +830,10 @@ class FieldSchema<
818
830
  ): Field.Component<this>;
819
831
  [component]<S extends Field.Shape>({
820
832
  state,
833
+ options: given,
821
834
  ...props
822
835
  }: Field.Component.Props<S, false>): unknown {
836
+ const options = this.#options(given);
823
837
  const value = state?.values?.[props.name];
824
838
  const issue = state?.issues?.find((i) => i.path[0] === props.name);
825
839
  const issueId = issue && `${props.name}-issue`;
@@ -868,7 +882,7 @@ class FieldSchema<
868
882
  ...data,
869
883
  });
870
884
 
871
- if (this.options && this.tag !== "select") {
885
+ if (options && this.tag !== "select") {
872
886
  // radio/checkboxes
873
887
  // make multiple ids for the group so all don't have the same id
874
888
  const groupId = (value: string) =>
@@ -881,7 +895,7 @@ class FieldSchema<
881
895
  ...control,
882
896
  id: groupId(data.value),
883
897
  // autofocus only the first input in the group
884
- autofocus: control.autofocus && data.value === this.options?.[0],
898
+ autofocus: control.autofocus && data.value === options[0],
885
899
  checked: chosen(data.value),
886
900
  ...data,
887
901
  });
@@ -909,6 +923,7 @@ class FieldSchema<
909
923
  Legend: (data: Field.Component.Legend = {}) =>
910
924
  jsx("legend", { children: label, ...data }),
911
925
  ...this,
926
+ options,
912
927
  };
913
928
  }
914
929
 
@@ -938,7 +953,7 @@ class FieldSchema<
938
953
  },
939
954
  Option:
940
955
  // select
941
- this.options &&
956
+ options &&
942
957
  ((data: Field.Component.Option<Field.Options>) =>
943
958
  jsx("option", {
944
959
  children: data.value,
@@ -946,6 +961,7 @@ class FieldSchema<
946
961
  ...data,
947
962
  })),
948
963
  ...this,
964
+ options,
949
965
  };
950
966
  }
951
967
 
@@ -962,7 +978,7 @@ class FieldSchema<
962
978
  Legend: (props?: Field.Component.Legend) => JSX.Element;
963
979
  Option: (props: Field.Component.Option<Field.Options>) => JSX.Element;
964
980
  };
965
- const { options } = this;
981
+ const options = this.#options(props.options);
966
982
 
967
983
  return c.Root({
968
984
  children: [
@@ -1235,6 +1251,14 @@ export namespace Field {
1235
1251
  /** Field name attribute */
1236
1252
  readonly name: ShapeUtil.Name<S>;
1237
1253
 
1254
+ /**
1255
+ * Choices of a checkbox group, radio group, or select made from a
1256
+ * schema, such as `Field.checkboxes(Schema.string().uuid())`, known
1257
+ * as the form renders. Each is shown as its value unless a custom
1258
+ * layout labels it.
1259
+ */
1260
+ readonly options?: readonly string[] | undefined;
1261
+
1238
1262
  /** Form state */
1239
1263
  readonly state?: (I extends true ? URL : Field.State<S>) | undefined;
1240
1264
  } & Field.Props;
@@ -1668,32 +1692,58 @@ export class Field {
1668
1692
  }
1669
1693
 
1670
1694
  /**
1695
+ * @param options The choices, or a schema that checks each one when they
1696
+ * are only known as the form renders, such as a record's own IDs
1697
+ * @returns Fixed choices, and the schema that checks one, when given a list
1698
+ */
1699
+ static #choices<V extends string>(
1700
+ options: readonly [V, ...V[]] | Schema<V>,
1701
+ ): [options: readonly V[], choice: Schema<V>] {
1702
+ return options instanceof Schema
1703
+ ? // given to `Field` or `component` as the form renders
1704
+ [[], options]
1705
+ : [options, Schema.enum(options, choose)];
1706
+ }
1707
+
1708
+ /**
1709
+ * A group of checkboxes, of fixed choices or of choices a schema checks,
1710
+ * which are given as the form renders:
1711
+ *
1712
+ * ```tsx
1713
+ * Field.checkboxes(["fall", "winter"]);
1714
+ * Field.checkboxes(Schema.string().uuid()); // <form.Field name="photos" options={ids} />
1715
+ * ```
1716
+ *
1671
1717
  * @template V Value type
1672
- * @param options Checkbox options
1718
+ * @param options Checkbox options, or a schema for each one
1673
1719
  * @returns Checkbox group input field
1674
1720
  */
1675
1721
  static checkboxes<const V extends string>(
1676
- options: readonly [V, ...V[]],
1722
+ options: readonly [V, ...V[]] | Schema<V>,
1677
1723
  ): Field.Instance<V[], "input", "checkbox", readonly [V, ...V[]]> {
1724
+ const [values, choice] = Field.#choices(options);
1725
+
1678
1726
  return new FieldSchema(
1679
- { options, props: { type: "checkbox" } },
1680
- Schema.array(Schema.enum(options, choose), choose),
1727
+ { options: values as readonly [V, ...V[]], props: { type: "checkbox" } },
1728
+ Schema.array(choice, choose),
1681
1729
  readMany,
1682
- options.length,
1730
+ values.length || Infinity,
1683
1731
  );
1684
1732
  }
1685
1733
 
1686
1734
  /**
1687
1735
  * @template V Value type
1688
- * @param options Radio button options
1736
+ * @param options Radio button options, or a schema for the one chosen
1689
1737
  * @returns Radio group input field
1690
1738
  */
1691
1739
  static radio<const V extends string>(
1692
- options: readonly [V, ...V[]],
1740
+ options: readonly [V, ...V[]] | Schema<V>,
1693
1741
  ): Field.Instance<V, "input", "radio", readonly [V, ...V[]]> {
1742
+ const [values, choice] = Field.#choices(options);
1743
+
1694
1744
  return new FieldSchema(
1695
- { options, props: { type: "radio" } },
1696
- Schema.enum(options, choose),
1745
+ { options: values as readonly [V, ...V[]], props: { type: "radio" } },
1746
+ choice,
1697
1747
  );
1698
1748
  }
1699
1749
 
@@ -1706,15 +1756,17 @@ export class Field {
1706
1756
 
1707
1757
  /**
1708
1758
  * @template V Value type
1709
- * @param options Select options
1759
+ * @param options Select options, or a schema for the one chosen
1710
1760
  * @returns Select field
1711
1761
  */
1712
1762
  static select<const V extends string>(
1713
- options: readonly [V, ...V[]],
1763
+ options: readonly [V, ...V[]] | Schema<V>,
1714
1764
  ): Field.Instance<V, "select", Field.Type, readonly [V, ...V[]]> {
1765
+ const [values, choice] = Field.#choices(options);
1766
+
1715
1767
  return new FieldSchema(
1716
- { tag: "select", options },
1717
- Schema.enum(options, choose),
1768
+ { tag: "select", options: values as readonly [V, ...V[]] },
1769
+ choice,
1718
1770
  );
1719
1771
  }
1720
1772
  }
@@ -1,5 +1,12 @@
1
1
  import type { JSX } from "../jsx/index.js";
2
- import { Group, type Markup, Render, Tag, readable } from "../markup/index.js";
2
+ import {
3
+ Group,
4
+ type Markup,
5
+ Render,
6
+ Source,
7
+ Tag,
8
+ readable,
9
+ } from "../markup/index.js";
3
10
 
4
11
  /** Parsed element */
5
12
  type Node = {
@@ -208,7 +215,8 @@ class Writer {
208
215
  // it ends, so they share one empty set, which is never changed
209
216
  this.#open(chunk.name, attrs ?? Writer.#none);
210
217
  if (chunk.closed) this.#close(chunk.name);
211
- } else if (chunk.raw) this.#raw(chunk.value);
218
+ } else if (chunk instanceof Source) this.#raw(chunk.markdown, true);
219
+ else if (chunk.raw) this.#raw(chunk.value);
212
220
  else this.#text(chunk.value);
213
221
  }
214
222
 
@@ -231,13 +239,15 @@ class Writer {
231
239
 
232
240
  /**
233
241
  * Raw HTML, such as from `Markup.raw`, is valid Markdown, so it is
234
- * written as it is.
242
+ * written as it is, as is Markdown source from `Markdown.raw`, which is
243
+ * always its own block.
235
244
  *
236
- * @param html HTML
245
+ * @param html HTML, or Markdown source
246
+ * @param source The text is Markdown source
237
247
  */
238
- #raw(html: string) {
248
+ #raw(html: string, source?: boolean) {
239
249
  if (!html || this.#skipping) return;
240
- const node = Writer.#node("!", {}, html);
250
+ const node = Writer.#node("!", source ? { source: "" } : {}, html);
241
251
  const parent = this.#stack.at(-1);
242
252
  if (parent) parent.children.push(node);
243
253
  else if (Writer.#isBlock(node)) {
@@ -1047,7 +1057,8 @@ class Writer {
1047
1057
  */
1048
1058
  static #isBlock(node: Node) {
1049
1059
  return node.tag === "!"
1050
- ? Writer.#rawBlock.test(node.children[0] as string)
1060
+ ? "source" in node.attrs ||
1061
+ Writer.#rawBlock.test(node.children[0] as string)
1051
1062
  : Writer.#blockTags.has(node.tag);
1052
1063
  }
1053
1064
 
@@ -1319,4 +1330,21 @@ export class Markdown {
1319
1330
 
1320
1331
  return markdown;
1321
1332
  }
1333
+
1334
+ /**
1335
+ * Markdown source with the HTML it renders to, such as steps written in
1336
+ * Markdown. Pages show the HTML, and agents reading the page as Markdown
1337
+ * get the source. Neither is escaped, so both must be safe.
1338
+ *
1339
+ * ```tsx
1340
+ * <section>{Markdown.raw(recipe.steps, render(recipe.steps))}</section>
1341
+ * ```
1342
+ *
1343
+ * @param markdown Markdown source
1344
+ * @param html Safe HTML it renders to
1345
+ * @returns New _safe_ chunk
1346
+ */
1347
+ static raw(markdown: unknown, html: unknown): Markup.Chunk {
1348
+ return new Source(markdown, html);
1349
+ }
1322
1350
  }
@@ -87,6 +87,24 @@ export class Tag extends Chunk {
87
87
  }
88
88
  }
89
89
 
90
+ /**
91
+ * Markup with its Markdown source, from `Markdown.raw`, internal to ovr. It
92
+ * is written as its markup, and as its source in Markdown.
93
+ */
94
+ export class Source extends Chunk {
95
+ /** Markdown source */
96
+ readonly markdown: string;
97
+
98
+ /**
99
+ * @param markdown Markdown source
100
+ * @param html Safe markup it renders to
101
+ */
102
+ constructor(markdown: unknown, html: unknown) {
103
+ super(html, true);
104
+ this.markdown = String(markdown ?? "");
105
+ }
106
+ }
107
+
90
108
  /**
91
109
  * Chunks a later sibling rendered while an earlier one was still rendering,
92
110
  * yielded together once they are next. Internal to ovr.
package/src/mcp/index.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { type App, agents, direct, mount } from "../app/index.js";
2
2
  import { type Context, agent } from "../context/index.js";
3
- import { forms } from "../form/index.js";
3
+ import { type Field, forms } from "../form/index.js";
4
4
  import type { Middleware } from "../middleware/index.js";
5
5
  import { Route, parameters, schemas } from "../route/index.js";
6
6
  import { Schema } from "../schema/index.js";
@@ -400,7 +400,14 @@ export class Mcp<P extends string = string> {
400
400
  const text =
401
401
  length > limit ? undefined : await Mcp.#text(c.req.body, limit);
402
402
  if (text === undefined)
403
- throw new RpcError(-32600, "Request too large", 413);
403
+ // the limit, so an agent knows how far to shrink a file, which base64
404
+ // makes about a third larger
405
+ throw new RpcError(
406
+ -32600,
407
+ `Request too large: at most ${Mcp.#size(limit)}, with files sent as base64, about a third larger than the file`,
408
+ 413,
409
+ { limit },
410
+ );
404
411
 
405
412
  const invalid = () => new RpcError(-32700, "Parse error", 400);
406
413
  if (text === null) throw invalid();
@@ -665,14 +672,38 @@ export class Mcp<P extends string = string> {
665
672
  Object.assign(properties, schema.properties);
666
673
  for (const field of (schema.required ?? []) as string[])
667
674
  required.add(field);
668
- // a tool's arguments are JSON, so a file is sent as its contents
675
+ // a tool's arguments are JSON, so a file is sent as its contents,
676
+ // and a JSON field as the value it parses, not a string of it
669
677
  for (const name in shape) {
670
678
  const field = shape[name]!;
679
+ const property = properties[name] as Json;
671
680
  if (field.type === "file")
672
- properties[name] = {
673
- ...(properties[name] as Json),
674
- ...(field.parts > 1 ? { items: Mcp.#file } : Mcp.#file),
675
- };
681
+ properties[name] =
682
+ field.parts > 1
683
+ ? { ...property, items: Mcp.#file }
684
+ : {
685
+ ...property,
686
+ ...Mcp.#file,
687
+ // the field's own, such as a size limit, then how to send it
688
+ description: [
689
+ (property.description as string | undefined)?.replace(
690
+ /\.$/,
691
+ "",
692
+ ),
693
+ Mcp.#file.description,
694
+ ]
695
+ .filter(Boolean)
696
+ .join(". "),
697
+ };
698
+ else if (Mcp.#whole(field)) {
699
+ const {
700
+ type: _,
701
+ contentMediaType: __,
702
+ contentSchema,
703
+ ...keywords
704
+ } = properties[name] as Json;
705
+ properties[name] = { ...(contentSchema as Json), ...keywords };
706
+ }
676
707
  }
677
708
  }
678
709
 
@@ -729,6 +760,28 @@ export class Mcp<P extends string = string> {
729
760
  required: ["name"],
730
761
  };
731
762
 
763
+ /**
764
+ * @param bytes Size in bytes
765
+ * @returns The size to read, such as `4 MB`
766
+ */
767
+ static #size(bytes: number) {
768
+ return bytes >= Size.mb
769
+ ? `${+(bytes / Size.mb).toFixed(1)} MB`
770
+ : `${Math.ceil(bytes / Size.kb)} KB`;
771
+ }
772
+
773
+ /**
774
+ * @param field Form field
775
+ * @returns `true` for a field that parses its one value as JSON, such as
776
+ * `Field.textarea().json(schema)`, also when made optional
777
+ */
778
+ static #whole(field: Field.Any) {
779
+ let def: Schema.Def | undefined = field.def;
780
+ while (def && def.type !== "json")
781
+ def = "inner" in def ? def.inner.def : undefined;
782
+ return Boolean(def);
783
+ }
784
+
732
785
  /**
733
786
  * @param value Tool argument for a file field
734
787
  * @returns The file, `undefined` when the argument does not describe one
@@ -860,6 +913,15 @@ export class Mcp<P extends string = string> {
860
913
  // a parameter is in the path, and also sent when a field has its name
861
914
  if (pathParams.has(name) && !field) continue;
862
915
  const upload = !read && field?.type === "file";
916
+ // a JSON field reads one value, so an array is sent whole, as its
917
+ // input schema describes it
918
+ const whole = field && Mcp.#whole(field);
919
+ if (whole && value != null) {
920
+ const text = JSON.stringify(value);
921
+ if (read) url.searchParams.append(name, text);
922
+ else body.append(name, text);
923
+ continue;
924
+ }
863
925
  for (const item of Array.isArray(value) ? value : [value]) {
864
926
  if (item == null || item === false) continue;
865
927
  if (upload) {