@rsc-kit/press 0.30.48 → 0.30.49

package/dist/forms/form.d.ts

@@ -1,6 +1,6 @@
 import type { ReactNode } from 'react';
 import type { Field, FieldOverride, FormSchema, ValuesOf } from '../resource.js';
-import type { HostFunction, HostInput } from './host.js';
+import type { HostAction, HostFields } from './host.js';
 import type { FormsTheme } from './theme.js';
 interface FormOptions {
     /** Unique in the app: the form is found by it when it is sent. Lowercase letters, digits and dashes. */
@@ -26,15 +26,16 @@ export interface FormDefinition<Schema extends FormSchema> extends FormOptions {
      */
     handle: (values: ValuesOf<Schema>) => void | Promise<void>;
 }
-export interface HostFormDefinition<Action extends HostFunction> extends FormOptions {
+export interface HostFormDefinition<Action extends HostAction> extends FormOptions {
     /**
-     * The backend function the form calls: Contact.send. Its fields are drawn
-     * from what the backend says it takes, and it does all the checking: a
-     * Laravel FormRequest, a Go function. Its refusals land under the fields.
+     * The backend action the form calls, as the build generated it:
+     * `import { contactSend } from '../server-actions.generated'`. Its fields are
+     * drawn from what the backend says it takes, and it does all the checking:
+     * a Laravel FormRequest, a Go struct. Its refusals land under the fields.
      */
     action: Action;
     /** Labels, descriptions and controls the backend's type cannot say. */
-    fields?: Partial<Record<keyof HostInput<Action> & string, FieldOverride>>;
+    fields?: Partial<Record<HostFields<Action>, FieldOverride>>;
 }
 /**
  * A form anyone may fill in - a contact form, a sign-up, a survey. Either from
@@ -50,7 +51,7 @@ export interface HostFormDefinition<Action extends HostFunction> extends FormOpt
  * be stored by the build.
  */
 export declare function defineForm<Schema extends FormSchema>(definition: FormDefinition<Schema>): PublicFormHandle;
-export declare function defineForm<Action extends HostFunction>(definition: HostFormDefinition<Action>): PublicFormHandle;
+export declare function defineForm<Action extends HostAction>(definition: HostFormDefinition<Action>): PublicFormHandle;
 export interface PublicFormHandle {
     name: string;
     fields: Field[];

package/dist/forms/form.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { fieldsOf } from '../resource.js';
 import { submitForm } from './actions.js';
-import { callHost, hostSchema, requireDrawable } from './host.js';
+import { hostSchema, requireDrawable } from './host.js';
 import { HONEYPOT } from './honeypot.js';
 import { registerForm } from './registry.js';
 export function defineForm(definition) {
@@ -12,6 +12,10 @@ export function defineForm(definition) {
         throw new Error(`[forms] the form ${definition.name} has both done and redirect; a sent form shows one or goes to the other`);
     }
     const { action } = definition;
+    if (typeof action === 'string') {
+        throw new Error(`[forms] the form ${definition.name}'s action is the generated action now, not its name: ` +
+            `import { contactSend } from '../server-actions.generated', then action: contactSend, for ${JSON.stringify(action)}`);
+    }
     if ((action === undefined) === (definition.form === undefined)) {
         throw new Error(`[forms] the form ${definition.name} needs a form schema with handle, or an action, and not both`);
     }
@@ -35,7 +39,7 @@ export function defineForm(definition) {
         fields();
     const handle = action === undefined
         ? definition.handle
-        : async (values) => void (await callHost(action, values));
+        : async (values) => void (await action(values));
     registerForm({
         name: definition.name,
         schema,

package/dist/forms/form.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/forms/form.tsx"],"names":[],"mappings":"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","sourcesContent":["import type { ReactNode } from 'react'\nimport { fieldsOf } from '../resource.js'\nimport type { Field, FieldOverride, FormSchema, ValuesOf } from '../resource.js'\nimport { submitForm } from './actions.js'\nimport { callHost, hostSchema, requireDrawable } from './host.js'\nimport type { HostFunction, HostInput } from './host.js'\nimport { HONEYPOT } from './honeypot.js'\nimport { registerForm } from './registry.js'\nimport type { FormsTheme } from './theme.js'\n\ninterface FormOptions {\n  /** Unique in the app: the form is found by it when it is sent. Lowercase letters, digits and dashes. */\n  name: string\n  /** What draws it: import { shadcn } from '@rsc-kit/press/shadcn'. */\n  theme: FormsTheme\n  /** The submit button's words. Send by default. */\n  submit?: string\n  /** What the visitor reads in place of the form once it is sent. */\n  done?: string\n  /** Where the visitor goes once it is sent, instead of `done`. */\n  redirect?: string\n}\n\nexport interface FormDefinition<Schema extends FormSchema> extends FormOptions {\n  /** Any Standard Schema of an object: z.object(), v.object(), type({...}). It checks every submission, on the server. */\n  form: Schema\n  /** Labels, descriptions and controls the schema cannot say - or every field, for a schema that does not describe itself as JSON Schema. */\n  fields?: Partial<Record<keyof ValuesOf<Schema> & string, FieldOverride>>\n  /**\n   * What a submission that passed the schema does: store it, send it, call a\n   * backend. Throw an ActionValidationError - or let a backend's 422 through -\n   * and its messages land under the fields.\n   */\n  handle: (values: ValuesOf<Schema>) => void | Promise<void>\n}\n\nexport interface HostFormDefinition<Action extends HostFunction> extends FormOptions {\n  /**\n   * The backend function the form calls: Contact.send. Its fields are drawn\n   * from what the backend says it takes, and it does all the checking: a\n   * Laravel FormRequest, a Go function. Its refusals land under the fields.\n   */\n  action: Action\n  /** Labels, descriptions and controls the backend's type cannot say. */\n  fields?: Partial<Record<keyof HostInput<Action> & string, FieldOverride>>\n}\n\n/**\n * A form anyone may fill in - a contact form, a sign-up, a survey. Either from\n * a Standard Schema, checked by the browser first and by the schema on the\n * server always, or from a backend function, checked by the browser first and\n * by the backend always. Place it in any page:\n *\n *     export default function Contact() {\n *       return <main><h1>Contact us</h1><contact.Form /></main>\n *     }\n *\n * The form reads nothing from the request, so the page around it can still\n * be stored by the build.\n */\nexport function defineForm<Schema extends FormSchema>(definition: FormDefinition<Schema>): PublicFormHandle\nexport function defineForm<Action extends HostFunction>(definition: HostFormDefinition<Action>): PublicFormHandle\nexport function defineForm(definition: (FormDefinition<FormSchema> | HostFormDefinition<string>) & { form?: FormSchema; action?: string }): PublicFormHandle {\n  if (!/^[a-z0-9-]+$/.test(definition.name)) {\n    throw new Error(`[forms] a form's name is lowercase letters, digits and dashes: ${JSON.stringify(definition.name)}`)\n  }\n\n  if (definition.done !== undefined && definition.redirect !== undefined) {\n    throw new Error(`[forms] the form ${definition.name} has both done and redirect; a sent form shows one or goes to the other`)\n  }\n\n  const { action } = definition\n\n  if ((action === undefined) === (definition.form === undefined)) {\n    throw new Error(`[forms] the form ${definition.name} needs a form schema with handle, or an action, and not both`)\n  }\n\n  const overrides = (definition.fields ?? {}) as Record<string, FieldOverride>\n  const schema = action === undefined ? definition.form! : hostSchema(action)\n  let drawn: Field[] | null = null\n\n  function fields(): Field[] {\n    if (drawn) return drawn\n\n    if (action !== undefined) requireDrawable(definition.name, action, overrides)\n\n    const fields = fieldsOf(schema, overrides)\n\n    if (fields.some((field) => field.name === HONEYPOT)) {\n      throw new Error(`[forms] the form ${definition.name} has a field named ${HONEYPOT}, which is the name its bot trap uses`)\n    }\n\n    return (drawn = fields)\n  }\n\n  // A backend's types arrive with the server entry, which runs after this\n  // module: those fields wait for the first render. A schema's fail here.\n  if (action === undefined) fields()\n\n  const handle = action === undefined\n    ? ((definition as FormDefinition<FormSchema>).handle as (values: Record<string, unknown>) => void | Promise<void>)\n    : async (values: Record<string, unknown>) => void (await callHost(action, values))\n\n  registerForm({\n    name: definition.name,\n    schema,\n    get fields() {\n      return fields()\n    },\n    handle,\n    redirect: definition.redirect ?? null,\n  })\n\n  const theme = definition.theme\n  const submit = definition.submit ?? 'Send'\n  const done = definition.redirect === undefined ? (definition.done ?? 'Thank you. It was sent.') : undefined\n\n  function Form() {\n    return (\n      <theme.PublicForm\n        action={submitForm.bind(null, definition.name)}\n        fields={fields()}\n        submit={submit}\n        {...(done === undefined ? {} : { done })}\n        honeypot={HONEYPOT}\n      />\n    )\n  }\n\n  return {\n    name: definition.name,\n    get fields() {\n      return fields()\n    },\n    Form,\n  }\n}\n\nexport interface PublicFormHandle {\n  name: string\n  fields: Field[]\n  Form: () => ReactNode\n}\n\nexport type PublicForm = PublicFormHandle\n"]}
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/forms/form.tsx"],"names":[],"mappings":"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","sourcesContent":["import type { ReactNode } from 'react'\nimport { fieldsOf } from '../resource.js'\nimport type { Field, FieldOverride, FormSchema, ValuesOf } from '../resource.js'\nimport { submitForm } from './actions.js'\nimport { hostSchema, requireDrawable } from './host.js'\nimport type { HostAction, HostFields } from './host.js'\nimport { HONEYPOT } from './honeypot.js'\nimport { registerForm } from './registry.js'\nimport type { FormsTheme } from './theme.js'\n\ninterface FormOptions {\n  /** Unique in the app: the form is found by it when it is sent. Lowercase letters, digits and dashes. */\n  name: string\n  /** What draws it: import { shadcn } from '@rsc-kit/press/shadcn'. */\n  theme: FormsTheme\n  /** The submit button's words. Send by default. */\n  submit?: string\n  /** What the visitor reads in place of the form once it is sent. */\n  done?: string\n  /** Where the visitor goes once it is sent, instead of `done`. */\n  redirect?: string\n}\n\nexport interface FormDefinition<Schema extends FormSchema> extends FormOptions {\n  /** Any Standard Schema of an object: z.object(), v.object(), type({...}). It checks every submission, on the server. */\n  form: Schema\n  /** Labels, descriptions and controls the schema cannot say - or every field, for a schema that does not describe itself as JSON Schema. */\n  fields?: Partial<Record<keyof ValuesOf<Schema> & string, FieldOverride>>\n  /**\n   * What a submission that passed the schema does: store it, send it, call a\n   * backend. Throw an ActionValidationError - or let a backend's 422 through -\n   * and its messages land under the fields.\n   */\n  handle: (values: ValuesOf<Schema>) => void | Promise<void>\n}\n\nexport interface HostFormDefinition<Action extends HostAction> extends FormOptions {\n  /**\n   * The backend action the form calls, as the build generated it:\n   * `import { contactSend } from '../server-actions.generated'`. Its fields are\n   * drawn from what the backend says it takes, and it does all the checking:\n   * a Laravel FormRequest, a Go struct. Its refusals land under the fields.\n   */\n  action: Action\n  /** Labels, descriptions and controls the backend's type cannot say. */\n  fields?: Partial<Record<HostFields<Action>, FieldOverride>>\n}\n\n/**\n * A form anyone may fill in - a contact form, a sign-up, a survey. Either from\n * a Standard Schema, checked by the browser first and by the schema on the\n * server always, or from a backend function, checked by the browser first and\n * by the backend always. Place it in any page:\n *\n *     export default function Contact() {\n *       return <main><h1>Contact us</h1><contact.Form /></main>\n *     }\n *\n * The form reads nothing from the request, so the page around it can still\n * be stored by the build.\n */\nexport function defineForm<Schema extends FormSchema>(definition: FormDefinition<Schema>): PublicFormHandle\nexport function defineForm<Action extends HostAction>(definition: HostFormDefinition<Action>): PublicFormHandle\nexport function defineForm(definition: (FormDefinition<FormSchema> | HostFormDefinition<HostAction>) & { form?: FormSchema; action?: HostAction }): PublicFormHandle {\n  if (!/^[a-z0-9-]+$/.test(definition.name)) {\n    throw new Error(`[forms] a form's name is lowercase letters, digits and dashes: ${JSON.stringify(definition.name)}`)\n  }\n\n  if (definition.done !== undefined && definition.redirect !== undefined) {\n    throw new Error(`[forms] the form ${definition.name} has both done and redirect; a sent form shows one or goes to the other`)\n  }\n\n  const { action } = definition\n\n  if (typeof action === 'string') {\n    throw new Error(\n      `[forms] the form ${definition.name}'s action is the generated action now, not its name: ` +\n        `import { contactSend } from '../server-actions.generated', then action: contactSend, for ${JSON.stringify(action)}`,\n    )\n  }\n\n  if ((action === undefined) === (definition.form === undefined)) {\n    throw new Error(`[forms] the form ${definition.name} needs a form schema with handle, or an action, and not both`)\n  }\n\n  const overrides = (definition.fields ?? {}) as Record<string, FieldOverride>\n  const schema = action === undefined ? definition.form! : hostSchema(action)\n  let drawn: Field[] | null = null\n\n  function fields(): Field[] {\n    if (drawn) return drawn\n\n    if (action !== undefined) requireDrawable(definition.name, action, overrides)\n\n    const fields = fieldsOf(schema, overrides)\n\n    if (fields.some((field) => field.name === HONEYPOT)) {\n      throw new Error(`[forms] the form ${definition.name} has a field named ${HONEYPOT}, which is the name its bot trap uses`)\n    }\n\n    return (drawn = fields)\n  }\n\n  // A backend's types arrive with the server entry, which runs after this\n  // module: those fields wait for the first render. A schema's fail here.\n  if (action === undefined) fields()\n\n  const handle = action === undefined\n    ? ((definition as FormDefinition<FormSchema>).handle as (values: Record<string, unknown>) => void | Promise<void>)\n    : async (values: Record<string, unknown>) => void (await (action as (values: Record<string, unknown>) => Promise<unknown>)(values))\n\n  registerForm({\n    name: definition.name,\n    schema,\n    get fields() {\n      return fields()\n    },\n    handle,\n    redirect: definition.redirect ?? null,\n  })\n\n  const theme = definition.theme\n  const submit = definition.submit ?? 'Send'\n  const done = definition.redirect === undefined ? (definition.done ?? 'Thank you. It was sent.') : undefined\n\n  function Form() {\n    return (\n      <theme.PublicForm\n        action={submitForm.bind(null, definition.name)}\n        fields={fields()}\n        submit={submit}\n        {...(done === undefined ? {} : { done })}\n        honeypot={HONEYPOT}\n      />\n    )\n  }\n\n  return {\n    name: definition.name,\n    get fields() {\n      return fields()\n    },\n    Form,\n  }\n}\n\nexport interface PublicFormHandle {\n  name: string\n  fields: Field[]\n  Form: () => ReactNode\n}\n\nexport type PublicForm = PublicFormHandle\n"]}

package/dist/forms/host.d.ts

@@ -1,26 +1,24 @@
+import type { FormFields } from '@rsc-kit/core/form';
 import type { FieldOverride, FormSchema } from '../resource.js';
 /**
- * A form with no schema of its own: defineForm({ action: 'Contact.send' }).
- * The backend said what the function takes when it wrote rsc-host.json, and
- * the build put that in the server entry, so the fields come from there and
- * every check is the backend's.
+ * A form with no schema of its own: defineForm({ action: contactSend }), with
+ * the action the build generated for the backend's Contact.send. The backend
+ * said what the function takes when it wrote rsc-host.json, and the build put
+ * that in the server entry, so the fields come from there and every check is
+ * the backend's.
  */
-declare global {
-    interface RscHostFunctions {
-    }
-}
-/** A function the backend has, once the build has typed them; any name before. */
-export type HostFunction = [keyof RscHostFunctions] extends [never] ? string : keyof RscHostFunctions & string;
-/** What a function takes as its one argument. */
-export type HostInput<Action extends string> = Action extends keyof RscHostFunctions ? RscHostFunctions[Action] extends {
-    args: [infer Input, ...unknown[]];
-} ? Input : Record<string, unknown> : Record<string, unknown>;
+/** A backend action the build generated: import { contactSend } from '../server-actions.generated'. */
+export type HostAction = (...args: never[]) => Promise<unknown>;
+/** The names of the fields an action's form has, as its generated stub declares them. */
+export type HostFields<Action> = Action extends (form: FormFields<infer Name>) => Promise<unknown> ? string extends Name ? string : Name : string;
+/** The backend function a generated action calls, or null for any other function. */
+export declare function targetOf(action: HostAction): string | null;
 /**
  * A Standard Schema that describes the backend's input and refuses nothing:
  * the rest of the form is the same as for any schema, and the checking is the
- * function's. The browser's checks come from the same description.
+ * function's. The browser's checks come from the same description. Read when
+ * the form first draws, by which time the server entry has run.
  */
-export declare function hostSchema(action: string): FormSchema;
+export declare function hostSchema(action: HostAction): FormSchema;
 /** A form must be able to draw what it was given, or say so rather than draw a text box. */
-export declare function requireDrawable(form: string, action: string, overrides: Record<string, FieldOverride>): void;
-export declare function callHost(action: string, values: Record<string, unknown>): Promise<unknown>;
+export declare function requireDrawable(form: string, action: HostAction, overrides: Record<string, FieldOverride>): void;

package/dist/forms/host.js

@@ -4,10 +4,15 @@ function hostForms() {
         throw new Error('[forms] a form with an action needs the rsc-kit server entry, which says what the backend takes');
     return forms;
 }
+/** The backend function a generated action calls, or null for any other function. */
+export function targetOf(action) {
+    return hostForms().actions.get(action) ?? null;
+}
 /**
  * A Standard Schema that describes the backend's input and refuses nothing:
  * the rest of the form is the same as for any schema, and the checking is the
- * function's. The browser's checks come from the same description.
+ * function's. The browser's checks come from the same description. Read when
+ * the form first draws, by which time the server entry has run.
  */
 export function hostSchema(action) {
     return {
@@ -15,27 +20,28 @@ export function hostSchema(action) {
             version: 1,
             vendor: 'rsc-kit',
             validate: (value) => ({ value: value }),
-            jsonSchema: { input: () => hostForms().inputs[action] },
+            jsonSchema: { input: () => hostForms().inputs[targetOf(action) ?? ''] },
         },
     };
 }
 /** A form must be able to draw what it was given, or say so rather than draw a text box. */
 export function requireDrawable(form, action, overrides) {
-    const input = hostForms().inputs[action];
+    const target = targetOf(action);
+    if (target === null) {
+        throw new Error(`[forms] the form ${form}'s action ${action.name || 'function'} is not one the build generated for the backend. ` +
+            "Import it from the generated server-actions module: import { contactSend } from '../server-actions.generated'.");
+    }
+    const input = hostForms().inputs[target];
     if (!input) {
         if (Object.keys(overrides).length > 0)
             return;
-        throw new Error(`[forms] the form ${form} calls ${action}, and the backend does not say it takes one object with named fields. ` +
-            'Check the name, or list every field in fields.');
+        throw new Error(`[forms] the form ${form} calls ${target}, and the backend does not say it takes one object with named fields. ` +
+            'Take a FormRequest in Laravel or a struct in Go, or list every field in fields.');
     }
     for (const [field, schema] of Object.entries(input.properties ?? {})) {
         if (!schema.type && !schema.enum && !schema.anyOf && !overrides[field]?.type) {
-            throw new Error(`[forms] the form ${form} cannot tell what ${action}'s ${field} is, which a file or an open type would be. Say it in fields.`);
+            throw new Error(`[forms] the form ${form} cannot tell what ${target}'s ${field} is, which a file or an open type would be. Say it in fields.`);
         }
     }
 }
-export function callHost(action, values) {
-    const call = globalThis[hostForms().global];
-    return call(action, values);
-}
 //# sourceMappingURL=host.js.map

package/dist/forms/host.js.map

@@ -1 +1 @@
-{"version":3,"file":"host.js","sourceRoot":"","sources":["../../src/forms/host.ts"],"names":[],"mappings":"AA4BA,SAAS,SAAS;IAChB,MAAM,KAAK,GAAI,UAAsC,CAAC,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAA0B,CAAA;IAEhH,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,iGAAiG,CAAC,CAAA;IAE9H,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,MAAc;IACvC,OAAO;QACL,WAAW,EAAE;YACX,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAgC,EAAE,CAAC;YAC3E,UAAU,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;SACxD;KACuB,CAAA;AAC5B,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,MAAc,EAAE,SAAwC;IACpG,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAExC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,OAAM;QAE7C,MAAM,IAAI,KAAK,CACb,oBAAoB,IAAI,UAAU,MAAM,wEAAwE;YAC9G,gDAAgD,CACnD,CAAA;IACH,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;YAC7E,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,qBAAqB,MAAM,MAAM,KAAK,+DAA+D,CAAC,CAAA;QAChJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAc,EAAE,MAA+B;IACtE,MAAM,IAAI,GAAI,UAAiD,CAAC,SAAS,EAAE,CAAC,MAAM,CAA2D,CAAA;IAE7I,OAAO,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAC7B,CAAC","sourcesContent":["import type { FieldOverride, FormSchema } from '../resource.js'\n\n/**\n * A form with no schema of its own: defineForm({ action: 'Contact.send' }).\n * The backend said what the function takes when it wrote rsc-host.json, and\n * the build put that in the server entry, so the fields come from there and\n * every check is the backend's.\n */\ndeclare global {\n  interface RscHostFunctions {}\n}\n\n/** A function the backend has, once the build has typed them; any name before. */\nexport type HostFunction = [keyof RscHostFunctions] extends [never] ? string : keyof RscHostFunctions & string\n\n/** What a function takes as its one argument. */\nexport type HostInput<Action extends string> = Action extends keyof RscHostFunctions\n  ? RscHostFunctions[Action] extends { args: [infer Input, ...unknown[]] }\n    ? Input\n    : Record<string, unknown>\n  : Record<string, unknown>\n\ninterface HostForms {\n  /** The global that calls the backend: rpc, unless rscKit({ hostGlobal }) renamed it. */\n  global: string\n  inputs: Record<string, { properties?: Record<string, Record<string, unknown>> }>\n}\n\nfunction hostForms(): HostForms {\n  const forms = (globalThis as Record<symbol, unknown>)[Symbol.for('rsc-kit.host-forms')] as HostForms | undefined\n\n  if (!forms) throw new Error('[forms] a form with an action needs the rsc-kit server entry, which says what the backend takes')\n\n  return forms\n}\n\n/**\n * A Standard Schema that describes the backend's input and refuses nothing:\n * the rest of the form is the same as for any schema, and the checking is the\n * function's. The browser's checks come from the same description.\n */\nexport function hostSchema(action: string): FormSchema {\n  return {\n    '~standard': {\n      version: 1,\n      vendor: 'rsc-kit',\n      validate: (value: unknown) => ({ value: value as Record<string, unknown> }),\n      jsonSchema: { input: () => hostForms().inputs[action] },\n    },\n  } as unknown as FormSchema\n}\n\n/** A form must be able to draw what it was given, or say so rather than draw a text box. */\nexport function requireDrawable(form: string, action: string, overrides: Record<string, FieldOverride>): void {\n  const input = hostForms().inputs[action]\n\n  if (!input) {\n    if (Object.keys(overrides).length > 0) return\n\n    throw new Error(\n      `[forms] the form ${form} calls ${action}, and the backend does not say it takes one object with named fields. ` +\n        'Check the name, or list every field in fields.',\n    )\n  }\n\n  for (const [field, schema] of Object.entries(input.properties ?? {})) {\n    if (!schema.type && !schema.enum && !schema.anyOf && !overrides[field]?.type) {\n      throw new Error(`[forms] the form ${form} cannot tell what ${action}'s ${field} is, which a file or an open type would be. Say it in fields.`)\n    }\n  }\n}\n\nexport function callHost(action: string, values: Record<string, unknown>): Promise<unknown> {\n  const call = (globalThis as unknown as Record<string, unknown>)[hostForms().global] as (name: string, ...args: unknown[]) => Promise<unknown>\n\n  return call(action, values)\n}\n"]}
+{"version":3,"file":"host.js","sourceRoot":"","sources":["../../src/forms/host.ts"],"names":[],"mappings":"AA4BA,SAAS,SAAS;IAChB,MAAM,KAAK,GAAI,UAAsC,CAAC,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAA0B,CAAA;IAEhH,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,iGAAiG,CAAC,CAAA;IAE9H,OAAO,KAAK,CAAA;AACd,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,QAAQ,CAAC,MAAkB;IACzC,OAAO,SAAS,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAA;AAChD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,MAAkB;IAC3C,OAAO;QACL,WAAW,EAAE;YACX,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,CAAC,KAAc,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAgC,EAAE,CAAC;YAC3E,UAAU,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE;SACxE;KACuB,CAAA;AAC5B,CAAC;AAED,4FAA4F;AAC5F,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,MAAkB,EAAE,SAAwC;IACxG,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;IAE/B,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,oBAAoB,IAAI,aAAa,MAAM,CAAC,IAAI,IAAI,UAAU,mDAAmD;YAC/G,gHAAgH,CACnH,CAAA;IACH,CAAC;IAED,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAExC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,OAAM;QAE7C,MAAM,IAAI,KAAK,CACb,oBAAoB,IAAI,UAAU,MAAM,wEAAwE;YAC9G,iFAAiF,CACpF,CAAA;IACH,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;YAC7E,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,qBAAqB,MAAM,MAAM,KAAK,+DAA+D,CAAC,CAAA;QAChJ,CAAC;IACH,CAAC;AACH,CAAC","sourcesContent":["import type { FormFields } from '@rsc-kit/core/form'\nimport type { FieldOverride, FormSchema } from '../resource.js'\n\n/**\n * A form with no schema of its own: defineForm({ action: contactSend }), with\n * the action the build generated for the backend's Contact.send. The backend\n * said what the function takes when it wrote rsc-host.json, and the build put\n * that in the server entry, so the fields come from there and every check is\n * the backend's.\n */\n\n/** A backend action the build generated: import { contactSend } from '../server-actions.generated'. */\nexport type HostAction = (...args: never[]) => Promise<unknown>\n\n/** The names of the fields an action's form has, as its generated stub declares them. */\nexport type HostFields<Action> = Action extends (form: FormFields<infer Name>) => Promise<unknown>\n  ? string extends Name\n    ? string\n    : Name\n  : string\n\ninterface HostForms {\n  /** Each generated action, and the backend function it calls. */\n  actions: Map<unknown, string>\n  /** What each backend function takes, by its name. */\n  inputs: Record<string, { properties?: Record<string, Record<string, unknown>> }>\n}\n\nfunction hostForms(): HostForms {\n  const forms = (globalThis as Record<symbol, unknown>)[Symbol.for('rsc-kit.host-forms')] as HostForms | undefined\n\n  if (!forms) throw new Error('[forms] a form with an action needs the rsc-kit server entry, which says what the backend takes')\n\n  return forms\n}\n\n/** The backend function a generated action calls, or null for any other function. */\nexport function targetOf(action: HostAction): string | null {\n  return hostForms().actions.get(action) ?? null\n}\n\n/**\n * A Standard Schema that describes the backend's input and refuses nothing:\n * the rest of the form is the same as for any schema, and the checking is the\n * function's. The browser's checks come from the same description. Read when\n * the form first draws, by which time the server entry has run.\n */\nexport function hostSchema(action: HostAction): FormSchema {\n  return {\n    '~standard': {\n      version: 1,\n      vendor: 'rsc-kit',\n      validate: (value: unknown) => ({ value: value as Record<string, unknown> }),\n      jsonSchema: { input: () => hostForms().inputs[targetOf(action) ?? ''] },\n    },\n  } as unknown as FormSchema\n}\n\n/** A form must be able to draw what it was given, or say so rather than draw a text box. */\nexport function requireDrawable(form: string, action: HostAction, overrides: Record<string, FieldOverride>): void {\n  const target = targetOf(action)\n\n  if (target === null) {\n    throw new Error(\n      `[forms] the form ${form}'s action ${action.name || 'function'} is not one the build generated for the backend. ` +\n        \"Import it from the generated server-actions module: import { contactSend } from '../server-actions.generated'.\",\n    )\n  }\n\n  const input = hostForms().inputs[target]\n\n  if (!input) {\n    if (Object.keys(overrides).length > 0) return\n\n    throw new Error(\n      `[forms] the form ${form} calls ${target}, and the backend does not say it takes one object with named fields. ` +\n        'Take a FormRequest in Laravel or a struct in Go, or list every field in fields.',\n    )\n  }\n\n  for (const [field, schema] of Object.entries(input.properties ?? {})) {\n    if (!schema.type && !schema.enum && !schema.anyOf && !overrides[field]?.type) {\n      throw new Error(`[forms] the form ${form} cannot tell what ${target}'s ${field} is, which a file or an open type would be. Say it in fields.`)\n    }\n  }\n}\n"]}

package/dist/forms/index.d.ts

@@ -1,3 +1,4 @@
 export { defineForm } from './form.js';
 export type { FormDefinition, HostFormDefinition, PublicForm } from './form.js';
 export type { FormsTheme, PublicFormProps } from './theme.js';
+export type { HostAction, HostFields } from './host.js';

package/dist/forms/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/forms/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA","sourcesContent":["export { defineForm } from './form.js'\nexport type { FormDefinition, HostFormDefinition, PublicForm } from './form.js'\nexport type { FormsTheme, PublicFormProps } from './theme.js'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/forms/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA","sourcesContent":["export { defineForm } from './form.js'\nexport type { FormDefinition, HostFormDefinition, PublicForm } from './form.js'\nexport type { FormsTheme, PublicFormProps } from './theme.js'\nexport type { HostAction, HostFields } from './host.js'\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsc-kit/press",
-  "version": "0.30.48",
+  "version": "0.30.49",
   "description": "Admin panels, public forms and pages built from blocks for rsc-kit: resources, data sources, tenants and plugins, with the drawing in a theme - shadcn/ui is the one that ships.",
   "type": "module",
   "license": "MIT",
@@ -50,7 +50,7 @@
     "prepack": "bun run build"
   },
   "peerDependencies": {
-    "@rsc-kit/core": "^0.30.48",
+    "@rsc-kit/core": "^0.30.49",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "tailwindcss": "^4.0.0"