@thomasfosterau/effect-forms-svelte 0.2.0 → 0.3.2

package/dist/Tainted.js

@@ -1,14 +1,16 @@
-//#region src/Tainted.ts
-const isObject = (value) => typeof value === "object" && value !== null;
+import * as Arr from "effect/Array";
+import * as Predicate from "effect/Predicate";
+import * as Record from "effect/Record";
+// src/Tainted.ts
+/** A non-null object or array, indexable by its own string keys. */
+const isObject = (value) => Predicate.isObjectOrArray(value);
+/** The union of both containers' own enumerable keys, `a`'s first. */
+const unionKeys = (a, b) => Arr.union(Record.keys(a), Record.keys(b));
 /** Structural deep equality for plain JSON-ish values. */
 function deepEqual(a, b) {
 	if (a === b) return true;
 	if (Array.isArray(a) && Array.isArray(b)) return a.length === b.length && a.every((item, i) => deepEqual(item, b[i]));
-	if (isObject(a) && isObject(b)) {
-		const keys = /* @__PURE__ */ new Set([...Object.keys(a), ...Object.keys(b)]);
-		for (const key of keys) if (!deepEqual(a[key], b[key])) return false;
-		return true;
-	}
+	if (isObject(a) && isObject(b)) return Arr.every(unionKeys(a, b), (key) => deepEqual(a[key], b[key]));
 	return false;
 }
 /** Whether two containers are the same kind (both arrays, or both plain objects). */
@@ -22,37 +24,27 @@ const sameKind = (a, b) => Array.isArray(a) === Array.isArray(b);
 */
 function computeTainted(original, current) {
 	if (!isObject(original) || !isObject(current) || !sameKind(original, current)) return {};
-	const out = {};
-	const keys = /* @__PURE__ */ new Set([...Object.keys(original), ...Object.keys(current)]);
-	for (const key of keys) {
+	return Record.fromEntries(Arr.flatMap(unionKeys(original, current), (key) => {
 		const before = original[key];
 		const after = current[key];
 		if (isObject(before) && isObject(after) && sameKind(before, after)) {
 			const nested = computeTainted(before, after);
-			if (Object.keys(nested).length > 0) out[key] = nested;
-		} else if (!deepEqual(before, after)) out[key] = true;
-	}
-	return out;
+			return Record.isEmptyReadonlyRecord(nested) ? [] : [[key, nested]];
+		}
+		return deepEqual(before, after) ? [] : [[key, true]];
+	}));
 }
 /** Whether anything in the tree is tainted. */
 function isAnyTainted(tainted) {
-	for (const key of Object.keys(tainted)) {
-		const value = tainted[key];
-		if (value === true) return true;
-		if (isObject(value) && isAnyTainted(value)) return true;
-	}
-	return false;
+	return Arr.some(Record.values(tainted), (value) => value === true || isObject(value) && isAnyTainted(value));
 }
 /** Whether the field at `path` (or anything beneath it) is tainted. */
 function isTaintedAt(tainted, path) {
-	let node = tainted;
-	for (const segment of path) {
-		if (node === void 0 || typeof node === "boolean") return node === true;
-		node = node[String(segment)];
-	}
-	if (node === void 0) return false;
-	if (typeof node === "boolean") return node;
-	return isAnyTainted(node);
+	const go = (node, rest) => Arr.match(rest, {
+		onEmpty: () => Predicate.isUndefined(node) ? false : Predicate.isBoolean(node) ? node : isAnyTainted(node),
+		onNonEmpty: (segments) => Predicate.isUndefined(node) || Predicate.isBoolean(node) ? node === true : go(node[String(Arr.headNonEmpty(segments))], Arr.tailNonEmpty(segments))
+	});
+	return go(tainted, path);
 }
 /**
 * Flatten a {@link TaintedFields} tree into the list of leaf {@link FormPath}s
@@ -62,20 +54,15 @@ function isTaintedAt(tainted, path) {
 * which only says *something* changed).
 */
 function taintedLeafPaths(tainted) {
-	const out = [];
-	const walk = (node, path) => {
-		for (const key of Object.keys(node)) {
-			const value = node[key];
-			if (value === void 0) continue;
-			const segment = /^\d+$/.test(key) ? Number(key) : key;
-			if (value === true) out.push([...path, segment]);
-			else if (typeof value === "object") walk(value, [...path, segment]);
-		}
-	};
-	walk(tainted, []);
-	return out;
+	const walk = (node, path) => Arr.flatMap(Record.toEntries(node), ([key, value]) => {
+		if (Predicate.isUndefined(value)) return [];
+		const segment = /^\d+$/.test(key) ? Number(key) : key;
+		if (value === true) return [[...path, segment]];
+		if (isObject(value)) return walk(value, [...path, segment]);
+		return [];
+	});
+	return walk(tainted, []);
 }
-//#endregion
 export { computeTainted, deepEqual, isAnyTainted, isTaintedAt, taintedLeafPaths };
 
 //# sourceMappingURL=Tainted.js.map

package/dist/Tainted.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tainted.js","names":[],"sources":["../src/Tainted.ts"],"sourcesContent":["/**\n * Tainted-field tracking — which fields the user has changed since the form\n * was seeded.\n *\n * A `tainted` store lets a UI show \"unsaved changes\",\n * guard navigation, or submit only what changed. This is the pure half: a deep\n * diff of the current data against the original snapshot producing a nested\n * boolean tree mirroring the data's shape. The reactive store\n * (`superForm.svelte.ts`) re-derives it as the data changes.\n *\n * @copyright Thomas Foster\n * @module effect-forms-svelte/Tainted\n */\n\nimport type { Issues } from \"@thomasfosterau/effect-forms\";\n\ntype FormPath = Issues.FormPath;\n\n/** A nested tree mirroring the form data, `true` where a leaf has changed. */\nexport interface TaintedFields {\n  readonly [key: string]: boolean | TaintedFields | undefined;\n}\n\nconst isObject = (value: unknown): value is Record<string, unknown> =>\n  typeof value === \"object\" && value !== null;\n\n/** Structural deep equality for plain JSON-ish values. */\nexport function deepEqual(a: unknown, b: unknown): boolean {\n  if (a === b) return true;\n  if (Array.isArray(a) && Array.isArray(b)) {\n    return a.length === b.length && a.every((item, i) => deepEqual(item, b[i]));\n  }\n  if (isObject(a) && isObject(b)) {\n    const keys = new Set([...Object.keys(a), ...Object.keys(b)]);\n    for (const key of keys) {\n      if (!deepEqual(a[key], b[key])) return false;\n    }\n    return true;\n  }\n  return false;\n}\n\n/** Whether two containers are the same kind (both arrays, or both plain objects). */\nconst sameKind = (a: unknown, b: unknown): boolean => Array.isArray(a) === Array.isArray(b);\n\n/**\n * Compare `current` against `original`, returning the nested tainted tree.\n * A changed scalar leaf is `true`; an unchanged leaf is omitted; nested objects\n * **and arrays** recurse (array elements keyed by index), so a single changed\n * row taints only that index — `taintedAt([\"items\", 2, \"name\"])` stays precise.\n * Keys present in either side are considered.\n */\nexport function computeTainted(original: unknown, current: unknown): TaintedFields {\n  if (!isObject(original) || !isObject(current) || !sameKind(original, current)) return {};\n\n  const out: Record<string, boolean | TaintedFields> = {};\n  const keys = new Set([...Object.keys(original), ...Object.keys(current)]);\n  for (const key of keys) {\n    const before = original[key];\n    const after = current[key];\n    if (isObject(before) && isObject(after) && sameKind(before, after)) {\n      const nested = computeTainted(before, after);\n      if (Object.keys(nested).length > 0) out[key] = nested;\n    } else if (!deepEqual(before, after)) {\n      out[key] = true;\n    }\n  }\n  return out;\n}\n\n/** Whether anything in the tree is tainted. */\nexport function isAnyTainted(tainted: TaintedFields): boolean {\n  for (const key of Object.keys(tainted)) {\n    const value = tainted[key];\n    if (value === true) return true;\n    if (isObject(value) && isAnyTainted(value)) return true;\n  }\n  return false;\n}\n\n/** Whether the field at `path` (or anything beneath it) is tainted. */\nexport function isTaintedAt(tainted: TaintedFields, path: FormPath): boolean {\n  let node: boolean | TaintedFields | undefined = tainted;\n  for (const segment of path) {\n    if (node === undefined || typeof node === \"boolean\") return node === true;\n    node = node[String(segment)];\n  }\n  if (node === undefined) return false;\n  if (typeof node === \"boolean\") return node;\n  return isAnyTainted(node);\n}\n\n/**\n * Flatten a {@link TaintedFields} tree into the list of leaf {@link FormPath}s\n * that actually changed, in depth-first order — the per-field-changed events\n * a reactive store needs to run per-field validators / clear a superseded\n * server error at exactly the field that moved (as opposed to `isAnyTainted`,\n * which only says *something* changed).\n */\nexport function taintedLeafPaths(tainted: TaintedFields): FormPath[] {\n  const out: FormPath[] = [];\n\n  const walk = (node: TaintedFields, path: Array<string | number>): void => {\n    for (const key of Object.keys(node)) {\n      const value = node[key];\n      if (value === undefined) continue;\n      const segment: string | number = /^\\d+$/.test(key) ? Number(key) : key;\n      if (value === true) out.push([...path, segment]);\n      else if (typeof value === \"object\") walk(value, [...path, segment]);\n    }\n  };\n\n  walk(tainted, []);\n  return out;\n}\n"],"mappings":";AAuBA,MAAM,YAAY,UAChB,OAAO,UAAU,YAAY,UAAU;;AAGzC,SAAgB,UAAU,GAAY,GAAqB;CACzD,IAAI,MAAM,GAAG,OAAO;CACpB,IAAI,MAAM,QAAQ,CAAC,KAAK,MAAM,QAAQ,CAAC,GACrC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,MAAM,MAAM,UAAU,MAAM,EAAE,EAAE,CAAC;CAE5E,IAAI,SAAS,CAAC,KAAK,SAAS,CAAC,GAAG;EAC9B,MAAM,uBAAO,IAAI,IAAI,CAAC,GAAG,OAAO,KAAK,CAAC,GAAG,GAAG,OAAO,KAAK,CAAC,CAAC,CAAC;EAC3D,KAAK,MAAM,OAAO,MAChB,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,GAAG,OAAO;EAEzC,OAAO;CACT;CACA,OAAO;AACT;;AAGA,MAAM,YAAY,GAAY,MAAwB,MAAM,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC;;;;;;;;AAS1F,SAAgB,eAAe,UAAmB,SAAiC;CACjF,IAAI,CAAC,SAAS,QAAQ,KAAK,CAAC,SAAS,OAAO,KAAK,CAAC,SAAS,UAAU,OAAO,GAAG,OAAO,CAAC;CAEvF,MAAM,MAA+C,CAAC;CACtD,MAAM,uBAAO,IAAI,IAAI,CAAC,GAAG,OAAO,KAAK,QAAQ,GAAG,GAAG,OAAO,KAAK,OAAO,CAAC,CAAC;CACxE,KAAK,MAAM,OAAO,MAAM;EACtB,MAAM,SAAS,SAAS;EACxB,MAAM,QAAQ,QAAQ;EACtB,IAAI,SAAS,MAAM,KAAK,SAAS,KAAK,KAAK,SAAS,QAAQ,KAAK,GAAG;GAClE,MAAM,SAAS,eAAe,QAAQ,KAAK;GAC3C,IAAI,OAAO,KAAK,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,OAAO;EACjD,OAAO,IAAI,CAAC,UAAU,QAAQ,KAAK,GACjC,IAAI,OAAO;CAEf;CACA,OAAO;AACT;;AAGA,SAAgB,aAAa,SAAiC;CAC5D,KAAK,MAAM,OAAO,OAAO,KAAK,OAAO,GAAG;EACtC,MAAM,QAAQ,QAAQ;EACtB,IAAI,UAAU,MAAM,OAAO;EAC3B,IAAI,SAAS,KAAK,KAAK,aAAa,KAAK,GAAG,OAAO;CACrD;CACA,OAAO;AACT;;AAGA,SAAgB,YAAY,SAAwB,MAAyB;CAC3E,IAAI,OAA4C;CAChD,KAAK,MAAM,WAAW,MAAM;EAC1B,IAAI,SAAS,KAAA,KAAa,OAAO,SAAS,WAAW,OAAO,SAAS;EACrE,OAAO,KAAK,OAAO,OAAO;CAC5B;CACA,IAAI,SAAS,KAAA,GAAW,OAAO;CAC/B,IAAI,OAAO,SAAS,WAAW,OAAO;CACtC,OAAO,aAAa,IAAI;AAC1B;;;;;;;;AASA,SAAgB,iBAAiB,SAAoC;CACnE,MAAM,MAAkB,CAAC;CAEzB,MAAM,QAAQ,MAAqB,SAAuC;EACxE,KAAK,MAAM,OAAO,OAAO,KAAK,IAAI,GAAG;GACnC,MAAM,QAAQ,KAAK;GACnB,IAAI,UAAU,KAAA,GAAW;GACzB,MAAM,UAA2B,QAAQ,KAAK,GAAG,IAAI,OAAO,GAAG,IAAI;GACnE,IAAI,UAAU,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC;QAC1C,IAAI,OAAO,UAAU,UAAU,KAAK,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC;EACpE;CACF;CAEA,KAAK,SAAS,CAAC,CAAC;CAChB,OAAO;AACT"}
+{"version":3,"file":"Tainted.js","names":[],"sources":["../src/Tainted.ts"],"sourcesContent":["/**\n * Tainted-field tracking — which fields the user has changed since the form\n * was seeded.\n *\n * A `tainted` store lets a UI show \"unsaved changes\",\n * guard navigation, or submit only what changed. This is the pure half: a deep\n * diff of the current data against the original snapshot producing a nested\n * boolean tree mirroring the data's shape. The reactive store\n * (`superForm.svelte.ts`) re-derives it as the data changes.\n *\n * @copyright Thomas Foster\n * @module effect-forms-svelte/Tainted\n */\n\nimport type { Issues } from \"@thomasfosterau/effect-forms\";\nimport * as Arr from \"effect/Array\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Record from \"effect/Record\";\n\ntype FormPath = Issues.FormPath;\n\n/** A nested tree mirroring the form data, `true` where a leaf has changed. */\nexport interface TaintedFields {\n  readonly [key: string]: boolean | TaintedFields | undefined;\n}\n\n/** An object or array read through its string keys. */\ntype Indexable = { readonly [key: string]: unknown };\n\n/** A non-null object or array, indexable by its own string keys. */\nconst isObject = (value: unknown): value is Indexable => Predicate.isObjectOrArray(value);\n\n/** The union of both containers' own enumerable keys, `a`'s first. */\nconst unionKeys = (a: Indexable, b: Indexable): Array<string> =>\n  Arr.union(Record.keys(a), Record.keys(b));\n\n/** Structural deep equality for plain JSON-ish values. */\nexport function deepEqual(a: unknown, b: unknown): boolean {\n  if (a === b) return true;\n  if (Array.isArray(a) && Array.isArray(b)) {\n    return a.length === b.length && a.every((item, i) => deepEqual(item, b[i]));\n  }\n  if (isObject(a) && isObject(b)) {\n    return Arr.every(unionKeys(a, b), (key) => deepEqual(a[key], b[key]));\n  }\n  return false;\n}\n\n/** Whether two containers are the same kind (both arrays, or both plain objects). */\nconst sameKind = (a: unknown, b: unknown): boolean => Array.isArray(a) === Array.isArray(b);\n\n/**\n * Compare `current` against `original`, returning the nested tainted tree.\n * A changed scalar leaf is `true`; an unchanged leaf is omitted; nested objects\n * **and arrays** recurse (array elements keyed by index), so a single changed\n * row taints only that index — `taintedAt([\"items\", 2, \"name\"])` stays precise.\n * Keys present in either side are considered.\n */\nexport function computeTainted(original: unknown, current: unknown): TaintedFields {\n  if (!isObject(original) || !isObject(current) || !sameKind(original, current)) return {};\n\n  return Record.fromEntries(\n    Arr.flatMap(\n      unionKeys(original, current),\n      (key): Array<readonly [string, boolean | TaintedFields]> => {\n        const before = original[key];\n        const after = current[key];\n        if (isObject(before) && isObject(after) && sameKind(before, after)) {\n          const nested = computeTainted(before, after);\n          return Record.isEmptyReadonlyRecord(nested) ? [] : [[key, nested]];\n        }\n        return deepEqual(before, after) ? [] : [[key, true]];\n      },\n    ),\n  );\n}\n\n/** Whether anything in the tree is tainted. */\nexport function isAnyTainted(tainted: TaintedFields): boolean {\n  return Arr.some(\n    Record.values(tainted),\n    (value) => value === true || (isObject(value) && isAnyTainted(value)),\n  );\n}\n\n/** Whether the field at `path` (or anything beneath it) is tainted. */\nexport function isTaintedAt(tainted: TaintedFields, path: FormPath): boolean {\n  const go = (node: boolean | TaintedFields | undefined, rest: FormPath): boolean =>\n    Arr.match(rest, {\n      onEmpty: () =>\n        Predicate.isUndefined(node) ? false : Predicate.isBoolean(node) ? node : isAnyTainted(node),\n      onNonEmpty: (segments) =>\n        Predicate.isUndefined(node) || Predicate.isBoolean(node)\n          ? node === true\n          : go(node[String(Arr.headNonEmpty(segments))], Arr.tailNonEmpty(segments)),\n    });\n  return go(tainted, path);\n}\n\n/**\n * Flatten a {@link TaintedFields} tree into the list of leaf {@link FormPath}s\n * that actually changed, in depth-first order — the per-field-changed events\n * a reactive store needs to run per-field validators / clear a superseded\n * server error at exactly the field that moved (as opposed to `isAnyTainted`,\n * which only says *something* changed).\n */\nexport function taintedLeafPaths(tainted: TaintedFields): FormPath[] {\n  const walk = (node: TaintedFields, path: Array<string | number>): FormPath[] =>\n    Arr.flatMap(Record.toEntries(node), ([key, value]): FormPath[] => {\n      if (Predicate.isUndefined(value)) return [];\n      const segment: string | number = /^\\d+$/.test(key) ? Number(key) : key;\n      if (value === true) return [[...path, segment]];\n      if (isObject(value)) return walk(value, [...path, segment]);\n      return [];\n    });\n\n  return walk(tainted, []);\n}\n"],"mappings":";;;;;AA8BA,MAAM,YAAY,UAAuC,UAAU,gBAAgB,KAAK;;AAGxF,MAAM,aAAa,GAAc,MAC/B,IAAI,MAAM,OAAO,KAAK,CAAC,GAAG,OAAO,KAAK,CAAC,CAAC;;AAG1C,SAAgB,UAAU,GAAY,GAAqB;CACzD,IAAI,MAAM,GAAG,OAAO;CACpB,IAAI,MAAM,QAAQ,CAAC,KAAK,MAAM,QAAQ,CAAC,GACrC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,MAAM,MAAM,UAAU,MAAM,EAAE,EAAE,CAAC;CAE5E,IAAI,SAAS,CAAC,KAAK,SAAS,CAAC,GAC3B,OAAO,IAAI,MAAM,UAAU,GAAG,CAAC,IAAI,QAAQ,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC;CAEtE,OAAO;AACT;;AAGA,MAAM,YAAY,GAAY,MAAwB,MAAM,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC;;;;;;;;AAS1F,SAAgB,eAAe,UAAmB,SAAiC;CACjF,IAAI,CAAC,SAAS,QAAQ,KAAK,CAAC,SAAS,OAAO,KAAK,CAAC,SAAS,UAAU,OAAO,GAAG,OAAO,CAAC;CAEvF,OAAO,OAAO,YACZ,IAAI,QACF,UAAU,UAAU,OAAO,IAC1B,QAA2D;EAC1D,MAAM,SAAS,SAAS;EACxB,MAAM,QAAQ,QAAQ;EACtB,IAAI,SAAS,MAAM,KAAK,SAAS,KAAK,KAAK,SAAS,QAAQ,KAAK,GAAG;GAClE,MAAM,SAAS,eAAe,QAAQ,KAAK;GAC3C,OAAO,OAAO,sBAAsB,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,MAAM,CAAC;EACnE;EACA,OAAO,UAAU,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC;CACrD,CACF,CACF;AACF;;AAGA,SAAgB,aAAa,SAAiC;CAC5D,OAAO,IAAI,KACT,OAAO,OAAO,OAAO,IACpB,UAAU,UAAU,QAAS,SAAS,KAAK,KAAK,aAAa,KAAK,CACrE;AACF;;AAGA,SAAgB,YAAY,SAAwB,MAAyB;CAC3E,MAAM,MAAM,MAA2C,SACrD,IAAI,MAAM,MAAM;EACd,eACE,UAAU,YAAY,IAAI,IAAI,QAAQ,UAAU,UAAU,IAAI,IAAI,OAAO,aAAa,IAAI;EAC5F,aAAa,aACX,UAAU,YAAY,IAAI,KAAK,UAAU,UAAU,IAAI,IACnD,SAAS,OACT,GAAG,KAAK,OAAO,IAAI,aAAa,QAAQ,CAAC,IAAI,IAAI,aAAa,QAAQ,CAAC;CAC/E,CAAC;CACH,OAAO,GAAG,SAAS,IAAI;AACzB;;;;;;;;AASA,SAAgB,iBAAiB,SAAoC;CACnE,MAAM,QAAQ,MAAqB,SACjC,IAAI,QAAQ,OAAO,UAAU,IAAI,IAAI,CAAC,KAAK,WAAuB;EAChE,IAAI,UAAU,YAAY,KAAK,GAAG,OAAO,CAAC;EAC1C,MAAM,UAA2B,QAAQ,KAAK,GAAG,IAAI,OAAO,GAAG,IAAI;EACnE,IAAI,UAAU,MAAM,OAAO,CAAC,CAAC,GAAG,MAAM,OAAO,CAAC;EAC9C,IAAI,SAAS,KAAK,GAAG,OAAO,KAAK,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC;EAC1D,OAAO,CAAC;CACV,CAAC;CAEH,OAAO,KAAK,SAAS,CAAC,CAAC;AACzB"}

package/dist/_virtual/_rolldown/runtime.js

@@ -1,4 +1,4 @@
-//#region \0rolldown/runtime.js
+// \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -9,5 +9,4 @@ var __exportAll = (all, no_symbols) => {
 	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
-//#endregion
 export { __exportAll };

package/dist/kit/ActionRedirect.d.ts

@@ -1,5 +1,4 @@
 import * as Option from "effect/Option";
-//#region src/kit/ActionRedirect.d.ts
 /**
  * A user-fixable failure's message; `None` takes the hard-error path.
  *
@@ -18,5 +17,4 @@ export declare const userFixableMessage: (cause: unknown, fallback: string) => O
  * answering the path and query only (never an origin).
  */
 export declare const withFailureParams: (target: string, params: Readonly<Record<string, string>>) => string;
-//#endregion
 //# sourceMappingURL=ActionRedirect.d.ts.map

package/dist/kit/ActionRedirect.js

@@ -1,7 +1,10 @@
 import { detailOf, jsonapiFailure } from "./CommandFailure.js";
-import * as Option from "effect/Option";
+import * as Arr from "effect/Array";
 import * as Predicate from "effect/Predicate";
-//#region src/kit/ActionRedirect.ts
+import * as Record from "effect/Record";
+import * as HashSet from "effect/HashSet";
+import * as Option from "effect/Option";
+// src/kit/ActionRedirect.ts
 /**
 * Failure routing for **action-only** routes: a route with no page of its
 * own (a restore, a confirm) always answers a submission with a redirect, so
@@ -14,11 +17,7 @@ import * as Predicate from "effect/Predicate";
 * @module effect-forms-svelte/kit/ActionRedirect
 */
 /** The statuses whose failure the submitter can act on (the form layer's set). */
-const USER_FIXABLE_STATUSES = /* @__PURE__ */ new Set([
-	400,
-	409,
-	422
-]);
+const USER_FIXABLE_STATUSES = HashSet.make(400, 409, 422);
 /**
 * A user-fixable failure's message; `None` takes the hard-error path.
 *
@@ -33,13 +32,12 @@ const USER_FIXABLE_STATUSES = /* @__PURE__ */ new Set([
 */
 const userFixableMessage = (cause, fallback) => {
 	if (!Predicate.isObjectOrArray(cause)) return Option.none();
-	const tagged = cause;
-	if (tagged._tag === "HttpError") {
-		if (tagged.status !== 400) return Option.none();
-		return Option.some(Predicate.isString(tagged.message) ? tagged.message : fallback);
+	if (Predicate.isTagged(cause, "HttpError")) {
+		if (!Predicate.hasProperty(cause, "status") || cause.status !== 400) return Option.none();
+		return Option.some(Predicate.hasProperty(cause, "message") && Predicate.isString(cause.message) ? cause.message : fallback);
 	}
-	if (tagged._tag !== "JsonapiError" && tagged._tag !== "ErrorResponse") return Option.none();
-	return jsonapiFailure(cause).pipe(Option.filter((failure) => USER_FIXABLE_STATUSES.has(failure.status)), Option.map((failure) => failure._tag === "Routed" ? detailOf(failure.errors[0], fallback) : failure.message));
+	if (!Predicate.isTagged(cause, "JsonapiError") && !Predicate.isTagged(cause, "ErrorResponse")) return Option.none();
+	return jsonapiFailure(cause).pipe(Option.filter((failure) => HashSet.has(USER_FIXABLE_STATUSES, failure.status)), Option.map((failure) => Predicate.isTagged(failure, "Routed") ? detailOf(failure.errors[0], fallback) : failure.message));
 };
 /**
 * Append the failure's query parameters to a same-origin return target,
@@ -47,10 +45,9 @@ const userFixableMessage = (cause, fallback) => {
 */
 const withFailureParams = (target, params) => {
 	const url = new URL(target, "http://localhost");
-	for (const [key, value] of Object.entries(params)) url.searchParams.set(key, value);
+	Arr.forEach(Record.toEntries(params), ([key, value]) => url.searchParams.set(key, value));
 	return url.pathname + url.search;
 };
-//#endregion
 export { userFixableMessage, withFailureParams };
 
 //# sourceMappingURL=ActionRedirect.js.map

package/dist/kit/ActionRedirect.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActionRedirect.js","names":[],"sources":["../../src/kit/ActionRedirect.ts"],"sourcesContent":["/**\n * Failure routing for **action-only** routes: a route with no page of its\n * own (a restore, a confirm) always answers a submission with a redirect, so\n * a *user-fixable* command failure rides back to the submitting page as\n * query parameters instead of a `fail()` (which would try to render the\n * action route's nonexistent page for a no-JS submitter). Everything else —\n * auth denials, infrastructure faults — stays a hard error at the caller.\n *\n * @copyright Thomas Foster\n * @module effect-forms-svelte/kit/ActionRedirect\n */\n\nimport * as Option from \"effect/Option\";\nimport * as Predicate from \"effect/Predicate\";\nimport { detailOf, jsonapiFailure } from \"./CommandFailure.ts\";\n\n/** The statuses whose failure the submitter can act on (the form layer's set). */\nconst USER_FIXABLE_STATUSES: ReadonlySet<number> = new Set([400, 409, 422]);\n\ninterface TaggedLike {\n  readonly _tag?: unknown;\n  readonly status?: unknown;\n  readonly message?: unknown;\n}\n\n/**\n * A user-fixable failure's message; `None` takes the hard-error path.\n *\n * - a `JsonapiError` / `ErrorResponse`-tagged cause at 400 / 409 / 422 → its\n *   first error object's `detail`, else `title`, else `fallback` (an\n *   `ErrorResponse` with no document → its own message);\n * - an `HttpError`-tagged 400 → its message (or `fallback`);\n * - anything else → `None`.\n *\n * `Some(\"\")` is a deliberate *present* answer: an error object carrying a\n * blank `detail` redirects with an empty parameter rather than escalating.\n */\nexport const userFixableMessage = (cause: unknown, fallback: string): Option.Option<string> => {\n  if (!Predicate.isObjectOrArray(cause)) return Option.none();\n  const tagged = cause as TaggedLike;\n  if (tagged._tag === \"HttpError\") {\n    if (tagged.status !== 400) return Option.none();\n    return Option.some(Predicate.isString(tagged.message) ? tagged.message : fallback);\n  }\n  if (tagged._tag !== \"JsonapiError\" && tagged._tag !== \"ErrorResponse\") return Option.none();\n  return jsonapiFailure(cause).pipe(\n    Option.filter((failure) => USER_FIXABLE_STATUSES.has(failure.status)),\n    Option.map((failure) =>\n      failure._tag === \"Routed\" ? detailOf(failure.errors[0], fallback) : failure.message,\n    ),\n  );\n};\n\n/**\n * Append the failure's query parameters to a same-origin return target,\n * answering the path and query only (never an origin).\n */\nexport const withFailureParams = (\n  target: string,\n  params: Readonly<Record<string, string>>,\n): string => {\n  const url = new URL(target, \"http://localhost\");\n  for (const [key, value] of Object.entries(params)) url.searchParams.set(key, value);\n  return url.pathname + url.search;\n};\n"],"mappings":";;;;;;;;;;;;;;;;AAiBA,MAAM,wCAA6C,IAAI,IAAI;CAAC;CAAK;CAAK;AAAG,CAAC;;;;;;;;;;;;;AAoB1E,MAAa,sBAAsB,OAAgB,aAA4C;CAC7F,IAAI,CAAC,UAAU,gBAAgB,KAAK,GAAG,OAAO,OAAO,KAAK;CAC1D,MAAM,SAAS;CACf,IAAI,OAAO,SAAS,aAAa;EAC/B,IAAI,OAAO,WAAW,KAAK,OAAO,OAAO,KAAK;EAC9C,OAAO,OAAO,KAAK,UAAU,SAAS,OAAO,OAAO,IAAI,OAAO,UAAU,QAAQ;CACnF;CACA,IAAI,OAAO,SAAS,kBAAkB,OAAO,SAAS,iBAAiB,OAAO,OAAO,KAAK;CAC1F,OAAO,eAAe,KAAK,CAAC,CAAC,KAC3B,OAAO,QAAQ,YAAY,sBAAsB,IAAI,QAAQ,MAAM,CAAC,GACpE,OAAO,KAAK,YACV,QAAQ,SAAS,WAAW,SAAS,QAAQ,OAAO,IAAI,QAAQ,IAAI,QAAQ,OAC9E,CACF;AACF;;;;;AAMA,MAAa,qBACX,QACA,WACW;CACX,MAAM,MAAM,IAAI,IAAI,QAAQ,kBAAkB;CAC9C,KAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,MAAM,GAAG,IAAI,aAAa,IAAI,KAAK,KAAK;CAClF,OAAO,IAAI,WAAW,IAAI;AAC5B"}
+{"version":3,"file":"ActionRedirect.js","names":[],"sources":["../../src/kit/ActionRedirect.ts"],"sourcesContent":["/**\n * Failure routing for **action-only** routes: a route with no page of its\n * own (a restore, a confirm) always answers a submission with a redirect, so\n * a *user-fixable* command failure rides back to the submitting page as\n * query parameters instead of a `fail()` (which would try to render the\n * action route's nonexistent page for a no-JS submitter). Everything else —\n * auth denials, infrastructure faults — stays a hard error at the caller.\n *\n * @copyright Thomas Foster\n * @module effect-forms-svelte/kit/ActionRedirect\n */\n\nimport * as Arr from \"effect/Array\";\nimport * as HashSet from \"effect/HashSet\";\nimport * as Option from \"effect/Option\";\nimport * as Predicate from \"effect/Predicate\";\nimport * as Record from \"effect/Record\";\nimport { detailOf, jsonapiFailure } from \"./CommandFailure.ts\";\n\n/** The statuses whose failure the submitter can act on (the form layer's set). */\nconst USER_FIXABLE_STATUSES: HashSet.HashSet<number> = HashSet.make(400, 409, 422);\n\n/**\n * A user-fixable failure's message; `None` takes the hard-error path.\n *\n * - a `JsonapiError` / `ErrorResponse`-tagged cause at 400 / 409 / 422 → its\n *   first error object's `detail`, else `title`, else `fallback` (an\n *   `ErrorResponse` with no document → its own message);\n * - an `HttpError`-tagged 400 → its message (or `fallback`);\n * - anything else → `None`.\n *\n * `Some(\"\")` is a deliberate *present* answer: an error object carrying a\n * blank `detail` redirects with an empty parameter rather than escalating.\n */\nexport const userFixableMessage = (cause: unknown, fallback: string): Option.Option<string> => {\n  if (!Predicate.isObjectOrArray(cause)) return Option.none();\n  if (Predicate.isTagged(cause, \"HttpError\")) {\n    if (!Predicate.hasProperty(cause, \"status\") || cause.status !== 400) return Option.none();\n    return Option.some(\n      Predicate.hasProperty(cause, \"message\") && Predicate.isString(cause.message)\n        ? cause.message\n        : fallback,\n    );\n  }\n  if (!Predicate.isTagged(cause, \"JsonapiError\") && !Predicate.isTagged(cause, \"ErrorResponse\")) {\n    return Option.none();\n  }\n  return jsonapiFailure(cause).pipe(\n    Option.filter((failure) => HashSet.has(USER_FIXABLE_STATUSES, failure.status)),\n    Option.map((failure) =>\n      Predicate.isTagged(failure, \"Routed\")\n        ? detailOf(failure.errors[0], fallback)\n        : failure.message,\n    ),\n  );\n};\n\n/**\n * Append the failure's query parameters to a same-origin return target,\n * answering the path and query only (never an origin).\n */\nexport const withFailureParams = (\n  target: string,\n  params: Readonly<Record<string, string>>,\n): string => {\n  const url = new URL(target, \"http://localhost\");\n  Arr.forEach(Record.toEntries(params), ([key, value]) => url.searchParams.set(key, value));\n  return url.pathname + url.search;\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAoBA,MAAM,wBAAiD,QAAQ,KAAK,KAAK,KAAK,GAAG;;;;;;;;;;;;;AAcjF,MAAa,sBAAsB,OAAgB,aAA4C;CAC7F,IAAI,CAAC,UAAU,gBAAgB,KAAK,GAAG,OAAO,OAAO,KAAK;CAC1D,IAAI,UAAU,SAAS,OAAO,WAAW,GAAG;EAC1C,IAAI,CAAC,UAAU,YAAY,OAAO,QAAQ,KAAK,MAAM,WAAW,KAAK,OAAO,OAAO,KAAK;EACxF,OAAO,OAAO,KACZ,UAAU,YAAY,OAAO,SAAS,KAAK,UAAU,SAAS,MAAM,OAAO,IACvE,MAAM,UACN,QACN;CACF;CACA,IAAI,CAAC,UAAU,SAAS,OAAO,cAAc,KAAK,CAAC,UAAU,SAAS,OAAO,eAAe,GAC1F,OAAO,OAAO,KAAK;CAErB,OAAO,eAAe,KAAK,CAAC,CAAC,KAC3B,OAAO,QAAQ,YAAY,QAAQ,IAAI,uBAAuB,QAAQ,MAAM,CAAC,GAC7E,OAAO,KAAK,YACV,UAAU,SAAS,SAAS,QAAQ,IAChC,SAAS,QAAQ,OAAO,IAAI,QAAQ,IACpC,QAAQ,OACd,CACF;AACF;;;;;AAMA,MAAa,qBACX,QACA,WACW;CACX,MAAM,MAAM,IAAI,IAAI,QAAQ,kBAAkB;CAC9C,IAAI,QAAQ,OAAO,UAAU,MAAM,IAAI,CAAC,KAAK,WAAW,IAAI,aAAa,IAAI,KAAK,KAAK,CAAC;CACxF,OAAO,IAAI,WAAW,IAAI;AAC5B"}

package/dist/kit/CommandFailure.d.ts

@@ -26,7 +26,7 @@ export type CommandFailure = RoutedFailure | MessageFailure;
 /** Construct a {@link RoutedFailure}. */
 export declare const routed: (status: number, errors: ReadonlyArray<ErrorObject>) => CommandFailure;
 /** Construct a {@link MessageFailure}. */
-export declare const message: (status: number, message: string) => CommandFailure;
+export declare const message: (status: number, text: string) => CommandFailure;
 /** A classifier: `Some` for a failure the form can show, `None` for an unexpected one. */
 export type Classify = (cause: unknown) => Option.Option<CommandFailure>;
 /** The fallback message for an error object with neither `detail` nor `title`. */
@@ -47,6 +47,5 @@ export declare const detailOf: (error: ErrorObject | undefined, fallback?: strin
  * - anything else → `None` (unexpected).
  */
 export declare const jsonapiFailure: Classify;
-//#endregion
 export { CommandFailure_d_exports };
 //# sourceMappingURL=CommandFailure.d.ts.map

package/dist/kit/CommandFailure.js

@@ -1,7 +1,8 @@
 import { __exportAll } from "../_virtual/_rolldown/runtime.js";
-import * as Option from "effect/Option";
+import * as Arr from "effect/Array";
 import * as Predicate from "effect/Predicate";
-//#region src/kit/CommandFailure.ts
+import * as Option from "effect/Option";
+// src/kit/CommandFailure.ts
 /**
 * Classifying what a form action's command failed with.
 *
@@ -35,26 +36,26 @@ const routed = (status, errors) => ({
 	errors
 });
 /** Construct a {@link MessageFailure}. */
-const message = (status, message) => ({
+const message = (status, text) => ({
 	_tag: "Message",
 	status,
-	message
+	message: text
 });
 /** The fallback message for an error object with neither `detail` nor `title`. */
 const DEFAULT_MESSAGE = "Request could not be completed";
 /** An error object's human message: its `detail`, else its `title`, else `fallback`. */
 const detailOf = (error, fallback = DEFAULT_MESSAGE) => error?.detail ?? error?.title ?? fallback;
 const isStatus = (u) => Predicate.isNumber(u) && Number.isInteger(u);
-const fromJsonapiError = (cause) => isStatus(cause.status) && Array.isArray(cause.errors) ? Option.some(routed(cause.status, cause.errors)) : Option.none();
-const fromErrorResponse = (cause) => {
-	if (!isStatus(cause.status)) return Option.none();
-	const errors = Option.isOption(cause.document) ? Option.flatMap(cause.document, (document) => Predicate.hasProperty(document, "errors") && Array.isArray(document.errors) && document.errors.length > 0 ? Option.some(document.errors) : Option.none()) : Option.none();
-	const status = cause.status;
-	return Option.some(Option.match(errors, {
-		onSome: (errors) => routed(status, errors),
-		onNone: () => message(status, Predicate.isString(cause.message) ? cause.message : DEFAULT_MESSAGE)
-	}));
-};
+/** The cause's `status`, when it carries an integer one. */
+const statusOf = (cause) => Predicate.hasProperty(cause, "status") && isStatus(cause.status) ? Option.some(cause.status) : Option.none();
+const fromJsonapiError = (cause) => Option.flatMap(statusOf(cause), (status) => Predicate.hasProperty(cause, "errors") && Array.isArray(cause.errors) ? Option.some(routed(status, cause.errors)) : Option.none());
+const fromErrorResponse = (cause) => Option.map(statusOf(cause), (status) => {
+	const errors = Predicate.hasProperty(cause, "document") && Option.isOption(cause.document) ? Option.flatMap(cause.document, (document) => Predicate.hasProperty(document, "errors") && Array.isArray(document.errors) && Arr.isReadonlyArrayNonEmpty(document.errors) ? Option.some(document.errors) : Option.none()) : Option.none();
+	return Option.match(errors, {
+		onSome: (routedErrors) => routed(status, routedErrors),
+		onNone: () => message(status, Predicate.hasProperty(cause, "message") && Predicate.isString(cause.message) ? cause.message : DEFAULT_MESSAGE)
+	});
+});
 /**
 * The default classifier:
 *
@@ -70,13 +71,10 @@ const fromErrorResponse = (cause) => {
 */
 const jsonapiFailure = (cause) => {
 	if (!Predicate.isObjectOrArray(cause)) return Option.none();
-	const tagged = cause;
-	if (tagged._tag === "JsonapiError") return fromJsonapiError(tagged);
-	if (tagged._tag === "ErrorResponse") return fromErrorResponse(tagged);
-	if (Predicate.isError(cause) && isStatus(tagged.status)) return Option.some(message(tagged.status, cause.message));
-	return Option.none();
+	if (Predicate.isTagged(cause, "JsonapiError")) return fromJsonapiError(cause);
+	if (Predicate.isTagged(cause, "ErrorResponse")) return fromErrorResponse(cause);
+	return Predicate.isError(cause) ? Option.map(statusOf(cause), (status) => message(status, cause.message)) : Option.none();
 };
-//#endregion
 export { CommandFailure_exports, DEFAULT_MESSAGE, detailOf, jsonapiFailure, message, routed };
 
 //# sourceMappingURL=CommandFailure.js.map

package/dist/kit/CommandFailure.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandFailure.js","names":[],"sources":["../../src/kit/CommandFailure.ts"],"sourcesContent":["/**\n * Classifying what a form action's command failed with.\n *\n * A command (an API client call, an Effect program) fails with whatever its\n * transport raises. The form layer only needs to know two things about it:\n * which JSON:API error objects it carried (so each can be routed onto a\n * field by its `source.pointer`), or, failing that, a status and a single\n * message for the whole form. {@link CommandFailure} is that view, and\n * {@link jsonapiFailure} is the default classifier.\n *\n * The error-object shape is `@thomasfosterau/effect-jsonapi`'s\n * `Document.ErrorObject` — an optional peer imported for its type only, so\n * nothing here depends on it at runtime and no application type leaks in.\n * Causes are recognised structurally by their `_tag`, so an application's\n * own `JsonapiError` with the same shape is recognised too.\n *\n * @copyright Thomas Foster\n * @module effect-forms-svelte/kit/CommandFailure\n */\n\nimport * as Option from \"effect/Option\";\nimport * as Predicate from \"effect/Predicate\";\nimport type { Document } from \"@thomasfosterau/effect-jsonapi\";\n\n/** One JSON:API error object: `@thomasfosterau/effect-jsonapi`'s `Document.ErrorObject`. */\nexport type ErrorObject = typeof Document.ErrorObject.Type;\n\n/** A failure carrying JSON:API error objects, each routed to a field (or the root) by its pointer. */\nexport interface RoutedFailure {\n  readonly _tag: \"Routed\";\n  readonly status: number;\n  readonly errors: ReadonlyArray<ErrorObject>;\n}\n\n/** A failure with no error objects to route: one whole-form message. */\nexport interface MessageFailure {\n  readonly _tag: \"Message\";\n  readonly status: number;\n  readonly message: string;\n}\n\n/**\n * What a form action needs to know about a recognised command failure. An\n * unrecognised failure is not a `CommandFailure` at all: the classifier\n * answers `None` and the action treats it as unexpected.\n */\nexport type CommandFailure = RoutedFailure | MessageFailure;\n\n/** Construct a {@link RoutedFailure}. */\nexport const routed = (status: number, errors: ReadonlyArray<ErrorObject>): CommandFailure => ({\n  _tag: \"Routed\",\n  status,\n  errors,\n});\n\n/** Construct a {@link MessageFailure}. */\nexport const message = (status: number, message: string): CommandFailure => ({\n  _tag: \"Message\",\n  status,\n  message,\n});\n\n/** A classifier: `Some` for a failure the form can show, `None` for an unexpected one. */\nexport type Classify = (cause: unknown) => Option.Option<CommandFailure>;\n\n/** The fallback message for an error object with neither `detail` nor `title`. */\nexport const DEFAULT_MESSAGE = \"Request could not be completed\";\n\n/** An error object's human message: its `detail`, else its `title`, else `fallback`. */\nexport const detailOf = (error: ErrorObject | undefined, fallback = DEFAULT_MESSAGE): string =>\n  error?.detail ?? error?.title ?? fallback;\n\ninterface TaggedLike {\n  readonly _tag?: unknown;\n  readonly status?: unknown;\n  readonly message?: unknown;\n  readonly errors?: unknown;\n  readonly document?: unknown;\n}\n\nconst isStatus = (u: unknown): u is number => Predicate.isNumber(u) && Number.isInteger(u);\n\n// `ServerErrors.JsonapiError` (effect-jsonapi) and the applications' own\n// `JsonapiError`: `{ _tag: \"JsonapiError\", status, errors }`.\nconst fromJsonapiError = (cause: TaggedLike): Option.Option<CommandFailure> =>\n  isStatus(cause.status) && Array.isArray(cause.errors)\n    ? Option.some(routed(cause.status, cause.errors as ReadonlyArray<ErrorObject>))\n    : Option.none();\n\n// `Client.ErrorResponse` (effect-jsonapi): `{ _tag: \"ErrorResponse\", status,\n// message, document: Option<ErrorDocument> }`. A decoded document routes its\n// error objects; a response with none is its message alone.\nconst fromErrorResponse = (cause: TaggedLike): Option.Option<CommandFailure> => {\n  if (!isStatus(cause.status)) return Option.none();\n  const errors = Option.isOption(cause.document)\n    ? Option.flatMap(cause.document as Option.Option<unknown>, (document) =>\n        Predicate.hasProperty(document, \"errors\") &&\n        Array.isArray(document.errors) &&\n        document.errors.length > 0\n          ? Option.some(document.errors as ReadonlyArray<ErrorObject>)\n          : Option.none(),\n      )\n    : Option.none<ReadonlyArray<ErrorObject>>();\n  const status = cause.status;\n  return Option.some(\n    Option.match(errors, {\n      onSome: (errors) => routed(status, errors),\n      onNone: () =>\n        message(status, Predicate.isString(cause.message) ? cause.message : DEFAULT_MESSAGE),\n    }),\n  );\n};\n\n/**\n * The default classifier:\n *\n * - a `JsonapiError`-tagged cause (`{ status, errors }`) → its error objects,\n *   at its own status;\n * - an `ErrorResponse`-tagged cause (effect-jsonapi's client-side decoded\n *   error) → its document's error objects, or its message when the response\n *   carried no document;\n * - an `Error` carrying a numeric `status` (a transport's status error, e.g.\n *   a 413 oversize upload the transport did not map to a document) → its\n *   message, at its own status;\n * - anything else → `None` (unexpected).\n */\nexport const jsonapiFailure: Classify = (cause) => {\n  if (!Predicate.isObjectOrArray(cause)) return Option.none();\n  const tagged = cause as TaggedLike;\n  if (tagged._tag === \"JsonapiError\") return fromJsonapiError(tagged);\n  if (tagged._tag === \"ErrorResponse\") return fromErrorResponse(tagged);\n  if (Predicate.isError(cause) && isStatus(tagged.status)) {\n    return Option.some(message(tagged.status, cause.message));\n  }\n  return Option.none();\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiDA,MAAa,UAAU,QAAgB,YAAwD;CAC7F,MAAM;CACN;CACA;AACF;;AAGA,MAAa,WAAW,QAAgB,aAAqC;CAC3E,MAAM;CACN;CACA;AACF;;AAMA,MAAa,kBAAkB;;AAG/B,MAAa,YAAY,OAAgC,WAAW,oBAClE,OAAO,UAAU,OAAO,SAAS;AAUnC,MAAM,YAAY,MAA4B,UAAU,SAAS,CAAC,KAAK,OAAO,UAAU,CAAC;AAIzF,MAAM,oBAAoB,UACxB,SAAS,MAAM,MAAM,KAAK,MAAM,QAAQ,MAAM,MAAM,IAChD,OAAO,KAAK,OAAO,MAAM,QAAQ,MAAM,MAAoC,CAAC,IAC5E,OAAO,KAAK;AAKlB,MAAM,qBAAqB,UAAqD;CAC9E,IAAI,CAAC,SAAS,MAAM,MAAM,GAAG,OAAO,OAAO,KAAK;CAChD,MAAM,SAAS,OAAO,SAAS,MAAM,QAAQ,IACzC,OAAO,QAAQ,MAAM,WAAqC,aACxD,UAAU,YAAY,UAAU,QAAQ,KACxC,MAAM,QAAQ,SAAS,MAAM,KAC7B,SAAS,OAAO,SAAS,IACrB,OAAO,KAAK,SAAS,MAAoC,IACzD,OAAO,KAAK,CAClB,IACA,OAAO,KAAiC;CAC5C,MAAM,SAAS,MAAM;CACrB,OAAO,OAAO,KACZ,OAAO,MAAM,QAAQ;EACnB,SAAS,WAAW,OAAO,QAAQ,MAAM;EACzC,cACE,QAAQ,QAAQ,UAAU,SAAS,MAAM,OAAO,IAAI,MAAM,UAAU,eAAe;CACvF,CAAC,CACH;AACF;;;;;;;;;;;;;;AAeA,MAAa,kBAA4B,UAAU;CACjD,IAAI,CAAC,UAAU,gBAAgB,KAAK,GAAG,OAAO,OAAO,KAAK;CAC1D,MAAM,SAAS;CACf,IAAI,OAAO,SAAS,gBAAgB,OAAO,iBAAiB,MAAM;CAClE,IAAI,OAAO,SAAS,iBAAiB,OAAO,kBAAkB,MAAM;CACpE,IAAI,UAAU,QAAQ,KAAK,KAAK,SAAS,OAAO,MAAM,GACpD,OAAO,OAAO,KAAK,QAAQ,OAAO,QAAQ,MAAM,OAAO,CAAC;CAE1D,OAAO,OAAO,KAAK;AACrB"}
+{"version":3,"file":"CommandFailure.js","names":[],"sources":["../../src/kit/CommandFailure.ts"],"sourcesContent":["/**\n * Classifying what a form action's command failed with.\n *\n * A command (an API client call, an Effect program) fails with whatever its\n * transport raises. The form layer only needs to know two things about it:\n * which JSON:API error objects it carried (so each can be routed onto a\n * field by its `source.pointer`), or, failing that, a status and a single\n * message for the whole form. {@link CommandFailure} is that view, and\n * {@link jsonapiFailure} is the default classifier.\n *\n * The error-object shape is `@thomasfosterau/effect-jsonapi`'s\n * `Document.ErrorObject` — an optional peer imported for its type only, so\n * nothing here depends on it at runtime and no application type leaks in.\n * Causes are recognised structurally by their `_tag`, so an application's\n * own `JsonapiError` with the same shape is recognised too.\n *\n * @copyright Thomas Foster\n * @module effect-forms-svelte/kit/CommandFailure\n */\n\nimport * as Arr from \"effect/Array\";\nimport * as Option from \"effect/Option\";\nimport * as Predicate from \"effect/Predicate\";\nimport type { Document } from \"@thomasfosterau/effect-jsonapi\";\n\n/** One JSON:API error object: `@thomasfosterau/effect-jsonapi`'s `Document.ErrorObject`. */\nexport type ErrorObject = typeof Document.ErrorObject.Type;\n\n/** A failure carrying JSON:API error objects, each routed to a field (or the root) by its pointer. */\nexport interface RoutedFailure {\n  readonly _tag: \"Routed\";\n  readonly status: number;\n  readonly errors: ReadonlyArray<ErrorObject>;\n}\n\n/** A failure with no error objects to route: one whole-form message. */\nexport interface MessageFailure {\n  readonly _tag: \"Message\";\n  readonly status: number;\n  readonly message: string;\n}\n\n/**\n * What a form action needs to know about a recognised command failure. An\n * unrecognised failure is not a `CommandFailure` at all: the classifier\n * answers `None` and the action treats it as unexpected.\n */\nexport type CommandFailure = RoutedFailure | MessageFailure;\n\n/** Construct a {@link RoutedFailure}. */\nexport const routed = (status: number, errors: ReadonlyArray<ErrorObject>): CommandFailure => ({\n  _tag: \"Routed\",\n  status,\n  errors,\n});\n\n/** Construct a {@link MessageFailure}. */\nexport const message = (status: number, text: string): CommandFailure => ({\n  _tag: \"Message\",\n  status,\n  message: text,\n});\n\n/** A classifier: `Some` for a failure the form can show, `None` for an unexpected one. */\nexport type Classify = (cause: unknown) => Option.Option<CommandFailure>;\n\n/** The fallback message for an error object with neither `detail` nor `title`. */\nexport const DEFAULT_MESSAGE = \"Request could not be completed\";\n\n/** An error object's human message: its `detail`, else its `title`, else `fallback`. */\nexport const detailOf = (error: ErrorObject | undefined, fallback = DEFAULT_MESSAGE): string =>\n  error?.detail ?? error?.title ?? fallback;\n\nconst isStatus = (u: unknown): u is number => Predicate.isNumber(u) && Number.isInteger(u);\n\n/** A cause recognised by its `_tag` as effect-jsonapi's (or an application's) `JsonapiError`. */\ninterface JsonapiErrorLike {\n  readonly _tag: \"JsonapiError\";\n}\n\n/** A cause recognised by its `_tag` as effect-jsonapi's client-side `ErrorResponse`. */\ninterface ErrorResponseLike {\n  readonly _tag: \"ErrorResponse\";\n}\n\n/** The cause's `status`, when it carries an integer one. */\nconst statusOf = (cause: JsonapiErrorLike | ErrorResponseLike | Error): Option.Option<number> =>\n  Predicate.hasProperty(cause, \"status\") && isStatus(cause.status)\n    ? Option.some(cause.status)\n    : Option.none();\n\n// `ServerErrors.JsonapiError` (effect-jsonapi) and the applications' own\n// `JsonapiError`: `{ _tag: \"JsonapiError\", status, errors }`.\nconst fromJsonapiError = (cause: JsonapiErrorLike): Option.Option<CommandFailure> =>\n  Option.flatMap(statusOf(cause), (status) =>\n    Predicate.hasProperty(cause, \"errors\") && Array.isArray(cause.errors)\n      ? // SAFETY: a `JsonapiError`-tagged cause carries JSON:API error objects in\n        // `errors` by that tag's contract (effect-jsonapi's `ServerErrors.JsonapiError`\n        // and the applications' own); causes are recognised structurally, not decoded.\n        Option.some(routed(status, cause.errors as ReadonlyArray<ErrorObject>))\n      : Option.none(),\n  );\n\n// `Client.ErrorResponse` (effect-jsonapi): `{ _tag: \"ErrorResponse\", status,\n// message, document: Option<ErrorDocument> }`. A decoded document routes its\n// error objects; a response with none is its message alone.\nconst fromErrorResponse = (cause: ErrorResponseLike): Option.Option<CommandFailure> =>\n  Option.map(statusOf(cause), (status) => {\n    const errors =\n      Predicate.hasProperty(cause, \"document\") && Option.isOption(cause.document)\n        ? Option.flatMap(cause.document, (document) =>\n            Predicate.hasProperty(document, \"errors\") &&\n            Array.isArray(document.errors) &&\n            Arr.isReadonlyArrayNonEmpty(document.errors)\n              ? // SAFETY: an `ErrorResponse`'s `document` is effect-jsonapi's decoded\n                // `ErrorDocument`, whose `errors` are JSON:API error objects.\n                Option.some(document.errors as ReadonlyArray<ErrorObject>)\n              : Option.none(),\n          )\n        : Option.none<ReadonlyArray<ErrorObject>>();\n    return Option.match(errors, {\n      onSome: (routedErrors) => routed(status, routedErrors),\n      onNone: () =>\n        message(\n          status,\n          Predicate.hasProperty(cause, \"message\") && Predicate.isString(cause.message)\n            ? cause.message\n            : DEFAULT_MESSAGE,\n        ),\n    });\n  });\n\n/**\n * The default classifier:\n *\n * - a `JsonapiError`-tagged cause (`{ status, errors }`) → its error objects,\n *   at its own status;\n * - an `ErrorResponse`-tagged cause (effect-jsonapi's client-side decoded\n *   error) → its document's error objects, or its message when the response\n *   carried no document;\n * - an `Error` carrying a numeric `status` (a transport's status error, e.g.\n *   a 413 oversize upload the transport did not map to a document) → its\n *   message, at its own status;\n * - anything else → `None` (unexpected).\n */\nexport const jsonapiFailure: Classify = (cause) => {\n  if (!Predicate.isObjectOrArray(cause)) return Option.none();\n  if (Predicate.isTagged(cause, \"JsonapiError\")) return fromJsonapiError(cause);\n  if (Predicate.isTagged(cause, \"ErrorResponse\")) return fromErrorResponse(cause);\n  return Predicate.isError(cause)\n    ? Option.map(statusOf(cause), (status) => message(status, cause.message))\n    : Option.none();\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkDA,MAAa,UAAU,QAAgB,YAAwD;CAC7F,MAAM;CACN;CACA;AACF;;AAGA,MAAa,WAAW,QAAgB,UAAkC;CACxE,MAAM;CACN;CACA,SAAS;AACX;;AAMA,MAAa,kBAAkB;;AAG/B,MAAa,YAAY,OAAgC,WAAW,oBAClE,OAAO,UAAU,OAAO,SAAS;AAEnC,MAAM,YAAY,MAA4B,UAAU,SAAS,CAAC,KAAK,OAAO,UAAU,CAAC;;AAazF,MAAM,YAAY,UAChB,UAAU,YAAY,OAAO,QAAQ,KAAK,SAAS,MAAM,MAAM,IAC3D,OAAO,KAAK,MAAM,MAAM,IACxB,OAAO,KAAK;AAIlB,MAAM,oBAAoB,UACxB,OAAO,QAAQ,SAAS,KAAK,IAAI,WAC/B,UAAU,YAAY,OAAO,QAAQ,KAAK,MAAM,QAAQ,MAAM,MAAM,IAIhE,OAAO,KAAK,OAAO,QAAQ,MAAM,MAAoC,CAAC,IACtE,OAAO,KAAK,CAClB;AAKF,MAAM,qBAAqB,UACzB,OAAO,IAAI,SAAS,KAAK,IAAI,WAAW;CACtC,MAAM,SACJ,UAAU,YAAY,OAAO,UAAU,KAAK,OAAO,SAAS,MAAM,QAAQ,IACtE,OAAO,QAAQ,MAAM,WAAW,aAC9B,UAAU,YAAY,UAAU,QAAQ,KACxC,MAAM,QAAQ,SAAS,MAAM,KAC7B,IAAI,wBAAwB,SAAS,MAAM,IAGvC,OAAO,KAAK,SAAS,MAAoC,IACzD,OAAO,KAAK,CAClB,IACA,OAAO,KAAiC;CAC9C,OAAO,OAAO,MAAM,QAAQ;EAC1B,SAAS,iBAAiB,OAAO,QAAQ,YAAY;EACrD,cACE,QACE,QACA,UAAU,YAAY,OAAO,SAAS,KAAK,UAAU,SAAS,MAAM,OAAO,IACvE,MAAM,UACN,eACN;CACJ,CAAC;AACH,CAAC;;;;;;;;;;;;;;AAeH,MAAa,kBAA4B,UAAU;CACjD,IAAI,CAAC,UAAU,gBAAgB,KAAK,GAAG,OAAO,OAAO,KAAK;CAC1D,IAAI,UAAU,SAAS,OAAO,cAAc,GAAG,OAAO,iBAAiB,KAAK;CAC5E,IAAI,UAAU,SAAS,OAAO,eAAe,GAAG,OAAO,kBAAkB,KAAK;CAC9E,OAAO,UAAU,QAAQ,KAAK,IAC1B,OAAO,IAAI,SAAS,KAAK,IAAI,WAAW,QAAQ,QAAQ,MAAM,OAAO,CAAC,IACtE,OAAO,KAAK;AAClB"}

package/dist/kit/Enhance.d.ts

@@ -1,6 +1,5 @@
 import { FormStore } from "../FormStore.svelte.js";
 import { Attachment } from "svelte/attachments";
-//#region src/kit/Enhance.d.ts
 /** The spreadable `<form>` props: the POST method plus the enhance attachment under its symbol key. */
 export interface EnhancedFormProps {
   readonly method: "post";
@@ -26,5 +25,4 @@ export interface EnhancedFormProps {
  * ```
  */
 export declare function enhanceForm(form: FormStore<any, any, any>): EnhancedFormProps;
-//#endregion
 //# sourceMappingURL=Enhance.d.ts.map

package/dist/kit/Enhance.js

@@ -1,7 +1,7 @@
 import { applyActionResult } from "../SvelteKit.js";
 import { createAttachmentKey } from "svelte/attachments";
 import { enhance } from "$app/forms";
-//#region src/kit/Enhance.ts
+// src/kit/Enhance.ts
 /**
 * SvelteKit `$app/forms` glue for the form store. {@link enhanceForm}
 * returns spreadable `<form>` props — `<form {...enhanceForm(form)}>` — that
@@ -51,7 +51,6 @@ function enhanceForm(form) {
 		}
 	};
 }
-//#endregion
 export { enhanceForm };
 
 //# sourceMappingURL=Enhance.js.map

package/dist/kit/FormAction.d.ts

@@ -3,7 +3,6 @@ import { Form, Result, State } from "@thomasfosterau/effect-forms";
 import * as Schema from "effect/Schema";
 import * as Effect from "effect/Effect";
 import { RequestEvent } from "@sveltejs/kit";
-//#region src/kit/FormAction.d.ts
 type FormState<A, Message = unknown> = State.FormState<A, Message>;
 type FormActionResult<A, Message = unknown> = Result.FormActionResult<A, Message>;
 type FormActionData<A = unknown, Message = unknown> = Result.FormActionData<A, Message>;
@@ -127,6 +126,5 @@ export type ActionCommand<I, O> = (input: I, event: RequestEvent) => Promise<O>
  * ```
  */
 export declare function formAction<S extends Schema.Top, O, Message = unknown>(form: Form.Form<S, Message>, run: ActionCommand<S["Type"], O>, locationFor: (output: O, input: S["Type"]) => string, options?: FormActionOptions<S["Type"], O>): (event: RequestEvent) => Promise<FormActionData<S["Type"], unknown> | import("@sveltejs/kit").ActionFailure<FormActionData<S["Type"], unknown>>>;
-//#endregion
 export { Command$1 as Command };
 //# sourceMappingURL=FormAction.d.ts.map

package/dist/kit/FormAction.js

@@ -1,13 +1,14 @@
 import { DEFAULT_MESSAGE, detailOf, jsonapiFailure } from "./CommandFailure.js";
 import { fieldFromPointer } from "./Pointer.js";
 import { Result, State } from "@thomasfosterau/effect-forms";
-import * as Effect from "effect/Effect";
-import * as Option from "effect/Option";
+import * as Match from "effect/Match";
 import * as Predicate from "effect/Predicate";
+import * as Option from "effect/Option";
+import * as Effect from "effect/Effect";
 import { fail, redirect } from "@sveltejs/kit";
 import * as Cause from "effect/Cause";
 import * as Exit from "effect/Exit";
-//#region src/kit/FormAction.ts
+// src/kit/FormAction.ts
 /**
 * Derive a SvelteKit page form action from an `@thomasfosterau/effect-forms`
 * form plus the command it submits to.
@@ -34,16 +35,12 @@ const toEffect = (thunk) => Effect.suspend(() => {
 		catch: (cause) => cause
 	});
 });
-const isConflict = (cause) => Predicate.isObjectOrArray(cause) && cause.status === 409 && (cause._tag === "JsonapiError" || cause._tag === "ErrorResponse");
-const submittedId = (input) => {
-	const id = Predicate.isObjectOrArray(input) ? input.id : void 0;
-	return Predicate.isString(id) && id !== "" ? id : void 0;
-};
-const retryOwnConflict = (create, fetchExisting, input) => toEffect(() => create(input)).pipe(Effect.catch((cause) => {
-	const id = submittedId(input);
-	if (id === void 0 || !isConflict(cause)) return Effect.fail(cause);
-	return toEffect(() => fetchExisting(id)).pipe(Effect.mapError(() => cause));
-}));
+const isConflict = (cause) => Predicate.isObjectOrArray(cause) && Predicate.hasProperty(cause, "status") && cause.status === 409 && (Predicate.isTagged(cause, "JsonapiError") || Predicate.isTagged(cause, "ErrorResponse"));
+const submittedId = (input) => Predicate.isObjectOrArray(input) && Predicate.hasProperty(input, "id") && Predicate.isString(input.id) && input.id !== "" ? Option.some(input.id) : Option.none();
+const retryOwnConflict = (create, fetchExisting, input) => toEffect(() => create(input)).pipe(Effect.catch((cause) => Option.match(isConflict(cause) ? submittedId(input) : Option.none(), {
+	onNone: () => Effect.fail(cause),
+	onSome: (id) => toEffect(() => fetchExisting(id)).pipe(Effect.mapError(() => cause))
+})));
 /**
 * Wrap a client-id create command so a 409 conflict on the caller's OWN
 * submitted `id` resolves as success instead of a form error — the
@@ -75,7 +72,7 @@ const fieldPath = (error) => Option.toArray(fieldFromPointer(error.source !== vo
 * at the empty path, which the nested error tree exposes as `_errors` — the
 * form-level message surface (`form.errors._errors`).
 */
-const routeFailure = (state, failure) => failure._tag === "Routed" ? failure.errors.reduce((acc, error) => State.withError(acc, fieldPath(error), detailOf(error)), state) : State.withError(state, [], failure.message);
+const routeFailure = (state, failure) => Predicate.isTagged(failure, "Routed") ? failure.errors.reduce((acc, error) => State.withError(acc, fieldPath(error), detailOf(error)), state) : State.withError(state, [], failure.message);
 /**
 * Validate `request` against `form`, then:
 *
@@ -97,18 +94,29 @@ const routeFailure = (state, failure) => failure._tag === "Routed" ? failure.err
 */
 async function runFormAction(form, request, run, locationFor, options = {}) {
 	const redact = options.redact ?? ((state) => state);
-	const state = await Effect.runPromise(form.validate(request));
-	if (!state.valid) return Result.failure(redact(state), 400);
-	const idempotent = options.idempotent;
-	const command = idempotent?.clientId === true ? retryOwnConflict(run, idempotent.fetchExisting, state.data) : toEffect(() => run(state.data));
-	const exit = await Effect.runPromiseExit(command);
-	if (Exit.isSuccess(exit)) return Result.redirect(locationFor(exit.value, state.data), 303);
-	const cause = Cause.squash(exit.cause);
-	const failure = (options.classify ?? jsonapiFailure)(cause);
-	if (Option.isSome(failure)) return Result.failure(redact(routeFailure(state, failure.value)), failure.value.status);
-	if (options.unrecognised === "throw") throw cause;
-	return Result.errorResult(Predicate.isError(cause) ? cause.message : DEFAULT_MESSAGE, 500);
+	const classify = options.classify ?? jsonapiFailure;
+	const validate = form.validate(request);
+	const program = Effect.flatMap(validate, (state) => {
+		if (!state.valid) return Effect.succeed(Result.failure(redact(state), 400));
+		const idempotent = options.idempotent;
+		const command = idempotent?.clientId === true ? retryOwnConflict(run, idempotent.fetchExisting, state.data) : toEffect(() => run(state.data));
+		return Effect.matchCauseEffect(command, {
+			onSuccess: (output) => Effect.sync(() => Result.redirect(locationFor(output, state.data), 303)),
+			onFailure: (commandCause) => Effect.suspend(() => {
+				const cause = Cause.squash(commandCause);
+				return Option.match(classify(cause), {
+					onSome: (failure) => Effect.sync(() => Result.failure(redact(routeFailure(state, failure)), failure.status)),
+					onNone: () => options.unrecognised === "throw" ? Effect.fail(cause) : Effect.succeed(Result.errorResult(Predicate.isError(cause) ? cause.message : DEFAULT_MESSAGE, 500))
+				});
+			})
+		});
+	});
+	const exit = await Effect.runPromiseExit(program);
+	if (Exit.isSuccess(exit)) return exit.value;
+	throw Cause.squash(exit.cause);
 }
+/** Pin an action's return to {@link FormActionData}, so every branch types alike. */
+const actionData = (data) => data;
 /**
 * Derive a SvelteKit page form **action** from `form` plus its command. The
 * handler validates the submission, runs the command on success, and maps
@@ -149,16 +157,14 @@ async function runFormAction(form, request, run, locationFor, options = {}) {
 function formAction(form, run, locationFor, options) {
 	return async (event) => {
 		const result = await runFormAction(form, event.request, (input) => run(input, event), locationFor, options);
-		const data = (d) => d;
-		switch (result._tag) {
-			case "Redirect": return redirect(result.status, result.location);
-			case "Failure": return fail(result.status, data({ form: result.state }));
-			case "Error": return fail(result.status, data({ message: result.message }));
-			case "Success": return data({ form: result.state });
-		}
+		return Match.valueTags(result, {
+			Redirect: (redirectResult) => redirect(redirectResult.status, redirectResult.location),
+			Failure: (failure) => fail(failure.status, actionData({ form: failure.state })),
+			Error: (error) => fail(error.status, actionData({ message: error.message })),
+			Success: (success) => actionData({ form: success.state })
+		});
 	};
 }
-//#endregion
 export { formAction, idempotentCreate, runFormAction };
 
 //# sourceMappingURL=FormAction.js.map