mlform 0.1.20 → 0.1.22

package/dist/{schema-CYsf2AFP.js → schema-CiCjXECD.js}

@@ -72,35 +72,72 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 	listReports() {
 		return Array.from(this.reportDefinitions.values());
 	}
-}, u = () => new l(), d = (e) => e, f = (e) => e, p = (e, t, n, r) => {
-	if (typeof n != "object" || !n) throw Error(`Series field "${e}" requires "${t}" configuration.`);
-	let i = "kind" in n && typeof n.kind == "string" ? n.kind : "";
-	if (i.length === 0) throw Error(`Series field "${e}" requires "${t}.kind".`);
-	if (i === "series") throw Error(`Series field "${e}" cannot nest series in "${t}".`);
-	if (!r.getField(i)) throw new c(`Series field "${e}" uses unknown sub-field kind "${i}" in "${t}".`);
-}, m = (e, t) => {
-	if (e.kind === "series" && (p(e.label, "field1", e.field1, t), p(e.label, "field2", e.field2, t), typeof e.minPoints == "number" && typeof e.maxPoints == "number" && e.minPoints > e.maxPoints)) throw Error(`Series field "${e.label}" requires minPoints to be less than or equal to maxPoints.`);
-}, h = (e, n, r, i) => {
-	let a = t((e ?? n) || i);
+}, u = () => new l(), d = (e) => e, f = (e) => e, p = class extends Error {
+	path;
+	code;
+	constructor(e, t, n = "invalid-config") {
+		super(e), this.path = t, this.code = n, this.name = "SchemaNormalizationError";
+	}
+}, m = (e, t, n, r, i) => {
+	if (typeof n != "object" || !n) throw new p(`Series field "${e}" requires "${t}" configuration.`, [
+		"fields",
+		i,
+		t
+	]);
+	let a = "kind" in n && typeof n.kind == "string" ? n.kind : "";
+	if (a.length === 0) throw new p(`Series field "${e}" requires "${t}.kind".`, [
+		"fields",
+		i,
+		t,
+		"kind"
+	]);
+	if (a === "series") throw new p(`Series field "${e}" cannot nest series in "${t}".`, [
+		"fields",
+		i,
+		t,
+		"kind"
+	]);
+	if (!r.getField(a)) throw new p(`Series field "${e}" uses unknown sub-field kind "${a}" in "${t}".`, [
+		"fields",
+		i,
+		t,
+		"kind"
+	], "unknown-kind");
+}, h = (e, t, n) => {
+	if (e.kind === "series" && (m(e.label, "field1", e.field1, t, n), m(e.label, "field2", e.field2, t, n), typeof e.minPoints == "number" && typeof e.maxPoints == "number" && e.minPoints > e.maxPoints)) throw new p(`Series field "${e.label}" requires minPoints to be less than or equal to maxPoints.`, [
+		"fields",
+		n,
+		"minPoints"
+	]);
+}, g = (e, n, r, i, a) => {
+	let o = t((e ?? n) || i);
 	if (e) {
-		if (r.has(a)) throw Error(`Duplicate explicit id "${a}" in schema.`);
-		return r.add(a), a;
+		if (r.has(o)) throw new p(`Duplicate explicit id "${o}" in schema.`, a);
+		return r.add(o), o;
 	}
-	let o = a, s = 2;
-	for (; r.has(o);) o = `${a}-${s}`, s += 1;
-	return r.add(o), o;
-}, g = (e, t, n, r) => {
+	let s = o, c = 2;
+	for (; r.has(s);) s = `${o}-${c}`, c += 1;
+	return r.add(s), s;
+}, _ = (e, t, n, r) => {
 	let i = n.getField(e.kind);
 	if (!i) throw new c(`Unknown field kind "${e.kind}".`);
 	let a = i.schema.parse(e);
-	return m(a, n), {
+	return h(a, n, t), {
 		...a,
-		id: h(a.id, a.label, r, `field-${t + 1}`)
+		id: g(a.id, a.label, r, `field-${t + 1}`, [
+			"fields",
+			t,
+			"id"
+		])
 	};
-}, _ = (e, t, n, r) => {
+}, v = (e, t, n, r) => {
 	let i = n.getReport(e.kind);
 	if (!i) throw new c(`Unknown report kind "${e.kind}".`);
-	let a = i.schema.parse(e), o = h(e.id ?? a.id, e.label ?? a.label ?? a.kind, r, `report-${t + 1}`);
+	let a = i.schema.parse(e), o = g(e.id ?? a.id, e.label ?? a.label ?? a.kind, r, `report-${t + 1}`, [
+		"reports",
+		t,
+		"id"
+	]);
 	return {
 		...a,
 		...e.label === void 0 ? {} : { label: e.label },
@@ -109,13 +146,13 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 		...e.ui === void 0 ? {} : { ui: e.ui },
 		id: o
 	};
-}, v = (e, t) => {
-	let n = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), i = (e.reports ?? []).map((e, n) => _(e, n, t, r));
+}, y = (e, t) => {
+	let n = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), i = (e.reports ?? []).map((e, n) => v(e, n, t, r));
 	return {
-		fields: e.fields.map((e, r) => g(e, r, t, n)),
+		fields: e.fields.map((e, r) => _(e, r, t, n)),
 		reports: i
 	};
-}, y = (e) => e === 1 || e === "1" || e === !0, b = (e, t, i = {}) => {
+}, b = (e) => e === 1 || e === "1" || e === !0, x = (e, t, i = {}) => {
 	if (e.kind !== "onehot-category" || !Array.isArray(e.options)) return;
 	let a = /* @__PURE__ */ new Set(), o;
 	for (let s of e.options) {
@@ -123,20 +160,20 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 		if (c === void 0) throw Error(`onehot-category "${e.id ?? e.kind}": option "${s.value}" has no mappedTo.`);
 		let l = r(c);
 		if (a.has(l)) throw Error(`onehot-category "${e.id ?? e.kind}": duplicate mappedTo "${l}".`);
-		if (a.add(l), y(t[l])) {
+		if (a.add(l), b(t[l])) {
 			if (o !== void 0) throw Error(`onehot-category "${e.id ?? e.kind}": multiple selected mapped values.`);
 			o = s.value;
 		}
 	}
 	return o;
-}, x = (e) => {
+}, S = (e) => {
 	if (typeof e == "string") return e;
 	if (typeof e != "number") return e.id ?? e.config?.id;
-}, S = (e, t) => {
+}, C = (e, t) => {
 	if (typeof e == "string" || typeof e == "number") return String(e);
 	let i = n(e.mappedTo ?? e.config?.mappedTo, t);
 	return i === void 0 ? void 0 : r(i);
-}, C = (e, t) => Object.fromEntries(e.map((e) => {
+}, w = (e, t) => Object.fromEntries(e.map((e) => {
 	let i = o(e, t), a = i?.context, s = i?.mappedTo ?? n(e.mappedTo, t.backend);
 	return [e.id, {
 		reportId: e.id,
@@ -146,25 +183,25 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 		target: s,
 		targetKey: s === void 0 ? void 0 : r(s),
 		backend: i?.backend ?? t.backend,
-		displayValues: a?.displayValues ?? t.displayValues ?? {},
-		modelValues: a?.modelValues ?? t.modelValues ?? t.serializedValues,
+		displayValues: a?.displayValues ?? t.displayValues,
+		modelValues: a?.modelValues ?? t.modelValues,
 		reports: t.reports,
 		meta: a?.meta ?? t.meta,
 		raw: a && "raw" in a ? a.raw : t.raw
 	}];
-})), w = (e, t) => {
-	let n = e.reportContexts ?? {}, r = x(t);
+})), T = (e, t) => {
+	let n = e.reportContexts, r = S(t);
 	if (r && n[r]) return n[r];
-	let i = S(t, e.backend);
+	let i = C(t, e.backend);
 	if (i === void 0) return;
 	let a = Object.values(n).filter((t) => t.targetKey === i && (e.backend === void 0 || t.backend === e.backend));
 	return a.length === 1 ? a[0] : void 0;
-}, T = (e) => typeof e == "object" && !!e && !Array.isArray(e), E = (e, t) => {
-	if (!T(e)) return [];
+}, E = (e) => typeof e == "object" && !!e && !Array.isArray(e), D = (e, t) => {
+	if (!E(e)) return [];
 	let n = [], r = (r) => {
 		let i = e[r];
 		Array.isArray(i) && i.forEach((e, i) => {
-			!T(e) || typeof e.kind != "string" || (r === "fields" ? t.getField(e.kind) : t.getReport(e.kind)) || n.push({
+			if (!(!E(e) || typeof e.kind != "string") && ((r === "fields" ? t.getField(e.kind) : t.getReport(e.kind)) || n.push({
 				section: r,
 				index: i,
 				kind: e.kind,
@@ -173,11 +210,24 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 					i,
 					"kind"
 				]
-			});
+			}), r === "fields" && e.kind === "series")) for (let a of ["field1", "field2"]) {
+				let o = e[a];
+				!E(o) || typeof o.kind != "string" || t.getField(o.kind) || n.push({
+					section: r,
+					index: i,
+					kind: o.kind,
+					path: [
+						r,
+						i,
+						a,
+						"kind"
+					]
+				});
+			}
 		});
 	};
 	return r("fields"), r("reports"), n;
-}, D = (e, t, n, r) => {
+}, O = (e, t, n, r) => {
 	if (!Array.isArray(t)) {
 		r.push({
 			path: [e],
@@ -187,7 +237,7 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 		return;
 	}
 	t.forEach((t, i) => {
-		if (!T(t)) {
+		if (!E(t)) {
 			r.push({
 				path: [e, i],
 				message: `${e === "fields" ? "Field" : "Report"} must be an object.`,
@@ -220,8 +270,8 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 			code: "invalid-config"
 		});
 	});
-}, O = (e, t) => {
-	if (!T(e)) return {
+}, k = (e, t) => {
+	if (!E(e)) return {
 		success: !1,
 		issues: [{
 			path: [],
@@ -235,8 +285,8 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 		message: `Unsupported schema property "${t}".`,
 		code: "invalid-schema"
 	});
-	D("fields", e.fields, t, n), D("reports", e.reports ?? [], t, n);
-	for (let r of E(e, t)) n.push({
+	O("fields", e.fields, t, n), O("reports", e.reports ?? [], t, n);
+	for (let r of D(e, t)) n.push({
 		path: r.path,
 		message: `Unknown ${r.section === "fields" ? "field" : "report"} kind "${r.kind}".`,
 		code: "unknown-kind"
@@ -248,26 +298,27 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 	try {
 		return {
 			success: !0,
-			data: v(e, t),
+			data: y(e, t),
 			issues: []
 		};
 	} catch (e) {
+		let t = e instanceof p ? e : void 0;
 		return {
 			success: !1,
 			issues: [{
-				path: [],
+				path: t?.path ?? [],
 				message: e instanceof Error ? e.message : "Schema normalization failed.",
-				code: "invalid-schema"
+				code: t?.code ?? "invalid-schema"
 			}]
 		};
 	}
-}, k = (t) => t.map((t) => e(t.schema, {
+}, A = (t) => t.map((t) => e(t.schema, {
 	io: "input",
 	unrepresentable: "any"
-})), A = (e) => {
-	let t = k(e);
+})), j = (e) => {
+	let t = A(e);
 	return t.length > 0 ? { oneOf: t } : !1;
-}, j = (e) => ({
+}, M = (e) => ({
 	$schema: "https://json-schema.org/draft/2020-12/schema",
 	type: "object",
 	additionalProperties: !1,
@@ -275,29 +326,25 @@ var t = (e) => e.trim().toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/
 	properties: {
 		fields: {
 			type: "array",
-			items: A(e.listFields())
+			items: j(e.listFields())
 		},
 		reports: {
 			type: "array",
-			items: A(e.listReports())
+			items: j(e.listReports())
 		}
 	}
-}), M = (e, t = {}) => ({
+}), N = (e, t = {}) => ({
 	reportId: t.reportId ?? "",
 	backend: e.backend,
-	inputs: e.inputs ?? [],
-	displayValues: e.displayValues ?? {},
-	modelValues: e.modelValues ?? e.serializedValues,
-	values: e.values,
-	fieldValues: e.fieldValues,
-	serializedValues: e.serializedValues,
-	serializedFieldValues: e.serializedFieldValues,
+	inputs: e.inputs,
+	displayValues: e.displayValues,
+	modelValues: e.modelValues,
 	reports: e.reports,
-	reportContext: t.reportId === void 0 ? void 0 : w(e, t.reportId),
-	reportContexts: e.reportContexts ?? {},
+	reportContext: t.reportId === void 0 ? void 0 : T(e, t.reportId),
+	reportContexts: e.reportContexts,
 	meta: e.meta,
 	raw: e.raw,
 	signal: t.signal
 });
 //#endregion
-export { n as _, C as a, v as c, d, f, i as g, o as h, O as i, c as l, s as m, E as n, w as o, r as p, j as r, b as s, M as t, u, t as v };
+export { a as _, w as a, t as b, p as c, u as d, d as f, o as g, s as h, k as i, y as l, r as m, D as n, T as o, f as p, M as r, x as s, N as t, c as u, i as v, n as y };

package/dist/types/src/primitives/controller-types.d.ts

@@ -18,15 +18,11 @@ export interface PrimitiveReportStateSnapshot {
 }
 export interface PrimitiveSubmitResult {
     backend?: string;
-    inputs?: PrimitiveSubmissionInputRecord[];
-    displayValues?: Record<string, unknown>;
-    modelValues?: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
+    inputs: PrimitiveSubmissionInputRecord[];
+    displayValues: Record<string, unknown>;
+    modelValues: Record<string, unknown>;
     reports: readonly unknown[];
-    reportContexts?: Record<string, PrimitiveReportContext>;
+    reportContexts: Record<string, PrimitiveReportContext>;
     reportStates: Record<string, unknown>;
     meta: Record<string, unknown>;
     raw: unknown;
@@ -114,16 +110,12 @@ export interface PrimitiveSubmitExecutionResult {
 export interface PrimitiveReportRequest {
     reportId: string;
     backend?: string;
-    inputs?: PrimitiveSubmissionInputRecord[];
-    displayValues?: Record<string, unknown>;
-    modelValues?: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
+    inputs: PrimitiveSubmissionInputRecord[];
+    displayValues: Record<string, unknown>;
+    modelValues: Record<string, unknown>;
     reports: readonly unknown[];
     reportContext?: PrimitiveReportContext;
-    reportContexts?: Record<string, PrimitiveReportContext>;
+    reportContexts: Record<string, PrimitiveReportContext>;
     meta: Record<string, unknown>;
     raw: unknown;
     signal?: AbortSignal;

package/dist/types/src/runtime/submission/request.d.ts

@@ -14,10 +14,6 @@ export type SubmissionValueRecords = {
     inputs: SubmissionInputRecord[];
     displayValues: Record<string, unknown>;
     modelValues: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
 };
 export declare const cloneSubmissionValueRecords: (records: SubmissionValueRecords) => SubmissionValueRecords;
 export declare const shouldIncludeFieldInSubmission: (field: SubmissionField, resolveInactiveFieldPolicy: (field: SubmissionField) => "include" | "omit" | "reset-on-hide") => boolean;

package/dist/types/src/runtime/types/behavior.d.ts

@@ -10,10 +10,6 @@ export interface RuntimeBehaviorSubmissionRecords {
     inputs: SubmissionInputRecord[];
     displayValues: Record<string, unknown>;
     modelValues: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
 }
 export interface RuntimeBehaviorContext {
     readonly registry: Registry;

package/dist/types/src/runtime/types/transport.d.ts

@@ -17,10 +17,6 @@ export interface BeforeSubmitContext {
     inputs: SubmissionInputRecord[];
     displayValues: Record<string, unknown>;
     modelValues: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
     submitCount: number;
     signal: AbortSignal;
 }
@@ -29,10 +25,6 @@ export interface AfterSubmitContext {
     inputs: SubmissionInputRecord[];
     displayValues: Record<string, unknown>;
     modelValues: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
     submitCount: number;
     result: SubmitResult;
 }
@@ -41,10 +33,6 @@ export interface SubmitErrorContext {
     inputs: SubmissionInputRecord[];
     displayValues: Record<string, unknown>;
     modelValues: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
     submitCount: number;
     error: unknown;
 }

package/dist/types/src/schema/mapped-to.d.ts

@@ -1,9 +1,14 @@
 import { ReportResult } from './types/submit';
 export type MappedToTarget = string | number;
 export type MappedTo = MappedToTarget | Record<string, MappedToTarget | null | undefined>;
+export type MappedToRoute = {
+    backend: string;
+    mappedTo: MappedToTarget;
+};
 export declare const resolveMappedTo: (mappedTo: MappedTo | undefined, backend: string | undefined) => MappedToTarget | undefined;
 export declare const mappedToKey: (target: MappedToTarget) => string;
 export declare const resolveMappedTargets: (mappedTo: MappedTo | undefined, backend: string | undefined) => MappedToTarget[];
+export declare const resolveMappedRoutes: (mappedTo: MappedTo | undefined, backend: string | undefined) => MappedToRoute[];
 export declare const resolveMappedReportResult: (report: {
     mappedTo?: MappedTo;
 }, result: {

package/dist/types/src/schema/normalize.d.ts

@@ -1,2 +1,7 @@
 import { FormSchema, NormalizedFormSchema, Registry } from './index';
+export declare class SchemaNormalizationError extends Error {
+    readonly path: readonly (string | number)[];
+    readonly code: "invalid-config" | "unknown-kind";
+    constructor(message: string, path: readonly (string | number)[], code?: "invalid-config" | "unknown-kind");
+}
 export declare const normalizeSchema: (schema: FormSchema, registry: Registry) => NormalizedFormSchema;

package/dist/types/src/schema/report-context.d.ts

@@ -2,7 +2,7 @@ import { MappedTo } from './mapped-to';
 import { NormalizedReportConfig } from './types/report';
 import { ReportContext, SubmitResult } from './types/submit';
 type ReportContextSource = Pick<SubmitResult, "backend"> & {
-    reportContexts?: Record<string, ReportContext>;
+    reportContexts: Record<string, ReportContext>;
 };
 type ReportContextLookup = string | number | {
     id?: string;
@@ -12,6 +12,6 @@ type ReportContextLookup = string | number | {
         mappedTo?: MappedTo;
     };
 };
-export declare const createReportContexts: (reports: readonly NormalizedReportConfig[], result: Pick<SubmitResult, "backend" | "displayValues" | "modelValues" | "serializedValues" | "reports" | "meta" | "raw">) => Record<string, ReportContext>;
+export declare const createReportContexts: (reports: readonly NormalizedReportConfig[], result: Pick<SubmitResult, "backend" | "displayValues" | "modelValues" | "reports" | "meta" | "raw">) => Record<string, ReportContext>;
 export declare const getReportContext: (source: ReportContextSource, lookup: ReportContextLookup) => ReportContext | undefined;
 export {};

package/dist/types/src/schema/types/report.d.ts

@@ -35,16 +35,12 @@ export interface ReportResolveContext<TConfig extends ReportConfig = ReportConfi
 export interface ReportFetchRequest {
     reportId: string;
     backend?: string;
-    inputs?: SubmissionInputRecord[];
-    displayValues?: Record<string, unknown>;
-    modelValues?: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
+    inputs: SubmissionInputRecord[];
+    displayValues: Record<string, unknown>;
+    modelValues: Record<string, unknown>;
     reports: readonly unknown[];
     reportContext?: ReportContext;
-    reportContexts?: Record<string, ReportContext>;
+    reportContexts: Record<string, ReportContext>;
     meta: Record<string, unknown>;
     raw: unknown;
     signal?: AbortSignal;

package/dist/types/src/schema/types/submit.d.ts

@@ -46,15 +46,11 @@ export type ReportResult = (BaseReportResult & {
 });
 export interface SubmitResult<TReportState = unknown> {
     backend?: string;
-    inputs?: SubmissionInputRecord[];
-    displayValues?: Record<string, unknown>;
-    modelValues?: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
+    inputs: SubmissionInputRecord[];
+    displayValues: Record<string, unknown>;
+    modelValues: Record<string, unknown>;
     reports: readonly ReportResult[];
-    reportContexts?: Record<string, ReportContext>;
+    reportContexts: Record<string, ReportContext>;
     reportStates: Record<string, TReportState>;
     meta: Record<string, unknown>;
     raw: unknown;

package/dist/types/src/transport/types.d.ts

@@ -1,13 +1,9 @@
 import { ReportResult, SubmissionInputRecord } from '../../schema';
 export interface SubmitRequest<TField extends Record<string, unknown> = Record<string, unknown>, TReport extends Record<string, unknown> = Record<string, unknown>> {
     backend?: string;
-    inputs?: SubmissionInputRecord[];
-    displayValues?: Record<string, unknown>;
-    modelValues?: Record<string, unknown>;
-    values: Record<string, unknown>;
-    fieldValues: Record<string, unknown>;
-    serializedValues: Record<string, unknown>;
-    serializedFieldValues: Record<string, unknown>;
+    inputs: SubmissionInputRecord[];
+    displayValues: Record<string, unknown>;
+    modelValues: Record<string, unknown>;
     fields: readonly TField[];
     reports: readonly TReport[];
     signal?: AbortSignal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mlform",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "private": false,
   "description": "Composable form generation utilities for machine learning backend integration",
   "keywords": [