@atscript/vue-form 0.1.103 → 0.1.104

package/dist/{as-form-CrMA0HdQ.cjs → as-form-B4DKpAVk.cjs}

@@ -1,8 +1,8 @@
 const require_use_form_context = require("./use-form-context-DpGiGUvJ.cjs");
 const require_use_as_nested_sections_store = require("./use-as-nested-sections-store--E0Ijpt5.cjs");
 const require_use_as_value_help = require("./use-as-value-help-BsAriqCI.cjs");
-const require_as_field = require("./as-field-BKa4D63r.cjs");
-const require_as_iterator = require("./as-iterator-DsDKfpTh.cjs");
+const require_as_field = require("./as-field-vktmRs-V.cjs");
+const require_as_iterator = require("./as-iterator-Bd-bKTMY.cjs");
 let vue = require("vue");
 let _atscript_ui = require("@atscript/ui");
 //#region src/composables/use-as-form-patch.ts
@@ -35,14 +35,22 @@ let _atscript_ui = require("@atscript/ui");
 * data (`dataRev`) or the baseline (`baselineRev`) changes, and Vue caches the
 * result between reads.
 *
-* @param def      getter for the form's `FormDef`
-* @param getData  getter for the WRAPPED form-data container `{ value }`. Before
-*                 real domain data arrives `useAsForm` yields the empty internal
-*                 fallback `{}` (no `value` key); the tracker treats that as
-*                 "no data yet" and defers the baseline until a `{ value: … }`
-*                 container appears (the fetch-then-fill flow).
+* @param def       getter for the form's `FormDef`
+* @param getData   getter for the WRAPPED form-data container `{ value }`. Before
+*                  real domain data arrives `useAsForm` yields the empty internal
+*                  fallback `{}` (no `value` key); the tracker treats that as
+*                  "no data yet" and defers the baseline until a `{ value: … }`
+*                  container appears (the fetch-then-fill flow). The SAME
+*                  container reference is also the write target for
+*                  `rebaseOnto` — mutating its `.value` preserves the bound
+*                  `:form-data` identity so the deep watch fires once.
+* @param onRebased optional callback fired AFTER `rebaseOnto` rewrites the live
+*                  data, so the host can force-remount the field subtree (e.g.
+*                  bump a key) when a union variant changed — the variant picker
+*                  detects its index once at setup and won't re-detect on a
+*                  data swap. No-op for `rebase()` (which doesn't move data).
 */
-function createAsFormPatch(def, getData) {
+function createAsFormPatch(def, getData, onRebased) {
 	let baseline;
 	const baselineRev = (0, vue.ref)(0);
 	const dataRev = (0, vue.ref)(0);
@@ -57,7 +65,7 @@ function createAsFormPatch(def, getData) {
 	function snapshot() {
 		const cur = getData();
 		if (cur.value === void 0) return void 0;
-		return deepClone((0, vue.toRaw)(cur));
+		return (0, _atscript_ui.deepClone)(cur, vue.toRaw);
 	}
 	function capture() {
 		baseline = snapshot();
@@ -87,46 +95,62 @@ function createAsFormPatch(def, getData) {
 	});
 	const isDirty = (0, vue.computed)(() => diff.value.isDirty);
 	const changes = (0, vue.computed)(() => diff.value.changes);
+	const dirtyPaths = (0, vue.computed)(() => (0, _atscript_ui.collectDirtyPaths)(changes.value));
 	function getPatch(opts) {
 		if (baseline === void 0) return {};
-		const frozen = deepClone((0, vue.toRaw)(getData()));
+		const frozen = (0, _atscript_ui.deepClone)(getData(), vue.toRaw);
 		return (0, _atscript_ui.buildFormDiff)(def(), baseline, frozen, opts).patch;
 	}
 	function getChanges() {
 		if (baseline === void 0) return [];
-		const frozen = deepClone((0, vue.toRaw)(getData()));
+		const frozen = (0, _atscript_ui.deepClone)(getData(), vue.toRaw);
 		return (0, _atscript_ui.buildFormDiff)(def(), baseline, frozen).changes;
 	}
+	function isDirtyPath(path) {
+		return dirtyPaths.value.has(path);
+	}
 	function rebase() {
 		capture();
 	}
+	/**
+	* 3-way rebase onto a fresh upstream snapshot (see
+	* {@link AsFormPatchHandle.rebaseOnto}). One reactive write, then an explicit
+	* re-baseline to the upstream snapshot.
+	*/
+	function rebaseOnto(upstream, opts) {
+		const u = (0, _atscript_ui.deepClone)(upstream, vue.toRaw);
+		if (baseline === void 0) {
+			const before = (0, _atscript_ui.deepClone)(getData(), vue.toRaw);
+			(0, _atscript_ui.setByPath)(getData(), "", u.value);
+			if ((0, _atscript_ui.unionVariantChanged)(def(), before, u)) onRebased?.();
+			capture();
+			return {
+				conflicts: [],
+				reapplied: []
+			};
+		}
+		const current = (0, _atscript_ui.deepClone)(getData(), vue.toRaw);
+		const { next, conflicts, reapplied } = (0, _atscript_ui.buildFormRebase)(def(), baseline, current, u, opts);
+		const variantMoved = (0, _atscript_ui.unionVariantChanged)(def(), current, next);
+		(0, _atscript_ui.setByPath)(getData(), "", next.value);
+		baseline = u;
+		baselineRev.value++;
+		if (variantMoved) onRebased?.();
+		return {
+			conflicts,
+			reapplied
+		};
+	}
 	return {
 		isDirty,
 		changes,
 		getPatch,
 		getChanges,
-		rebase
+		isDirtyPath,
+		rebase,
+		rebaseOnto
 	};
 }
-/**
-* Structural deep clone of plain JSON-ish data (objects / arrays / primitives /
-* Date). Used to freeze the baseline so later edits to the live form data don't
-* mutate it. `structuredClone` would throw on Vue proxies / functions; this
-* walks own-enumerable keys and copies leaves by value.
-*/
-function deepClone(value) {
-	if (value === null || typeof value !== "object") return value;
-	if (value instanceof Date) return new Date(value.getTime());
-	if (Array.isArray(value)) {
-		const out = [];
-		for (let i = 0; i < value.length; i++) out.push(deepClone((0, vue.toRaw)(value[i])));
-		return out;
-	}
-	const src = value;
-	const out = {};
-	for (const k of Object.keys(src)) out[k] = deepClone((0, vue.toRaw)(src[k]));
-	return out;
-}
 const NOT_TRACKING_MSG = "useAsFormPatch(): change tracking is not enabled on this form. Pass `track-changes` to <AsForm> (or `trackChanges: true` to useAsForm).";
 /**
 * Reactive read-only access to the form's change-tracking handle from any
@@ -295,6 +319,7 @@ function useAsState(opts) {
 const EMPTY_CHANGES = Object.freeze([]);
 const EMPTY_GET_PATCH = () => ({});
 const EMPTY_GET_CHANGES = () => [];
+const EMPTY_IS_DIRTY_PATH = () => false;
 /**
 * Composable backing `<AsForm>`. Owns the entire form state machine —
 * data container, internal validator, external-error dismissal, action
@@ -330,7 +355,10 @@ function useAsForm(options) {
 			context: formContext.value ?? {}
 		})
 	});
-	const patch = options.trackChanges?.() ? createAsFormPatch(() => options.def(), () => data.value) : void 0;
+	const remountKey = (0, vue.ref)(0);
+	const patch = options.trackChanges?.() ? createAsFormPatch(() => options.def(), () => data.value, () => {
+		remountKey.value++;
+	}) : void 0;
 	if (patch) (0, vue.provide)(require_use_form_context.FORM_PATCH_KEY, patch);
 	const reset = patch ? async () => {
 		await resetState();
@@ -386,7 +414,8 @@ function useAsForm(options) {
 		isDirty: patch?.isDirty.value ?? false,
 		changes: patch ? patch.changes.value : EMPTY_CHANGES,
 		getPatch: patch ? patch.getPatch : EMPTY_GET_PATCH,
-		getChanges: patch ? patch.getChanges : EMPTY_GET_CHANGES
+		getChanges: patch ? patch.getChanges : EMPTY_GET_CHANGES,
+		isDirtyPath: patch ? patch.isDirtyPath : EMPTY_IS_DIRTY_PATH
 	}));
 	function supportsAction(def, actionId) {
 		return (0, _atscript_ui.getDeclaredFormActions)(def).some((a) => a.id === actionId);
@@ -446,7 +475,8 @@ function useAsForm(options) {
 		dismissFormError: ext.dismissForm,
 		formContext,
 		handleChange,
-		patch
+		patch,
+		remountKey
 	};
 }
 //#endregion
@@ -561,7 +591,12 @@ var as_form_default = /* @__PURE__ */ (0, vue.defineComponent)({
 			},
 			getPatch: form.patch ? form.patch.getPatch : () => ({}),
 			getChanges: form.patch ? form.patch.getChanges : () => [],
-			rebase: form.patch ? form.patch.rebase : () => {}
+			isDirtyPath: form.patch ? form.patch.isDirtyPath : () => false,
+			rebase: form.patch ? form.patch.rebase : () => {},
+			rebaseOnto: form.patch ? form.patch.rebaseOnto : () => ({
+				conflicts: [],
+				reapplied: []
+			})
 		});
 		return (_ctx, _cache) => {
 			return (0, vue.openBlock)(), (0, vue.createElementBlock)("form", {
@@ -571,7 +606,10 @@ var as_form_default = /* @__PURE__ */ (0, vue.defineComponent)({
 			}, [
 				(0, vue.renderSlot)(_ctx.$slots, "form.header", (0, vue.normalizeProps)((0, vue.guardReactiveProps)((0, vue.unref)(form).slotProps.value))),
 				(0, vue.renderSlot)(_ctx.$slots, "form.before", (0, vue.normalizeProps)((0, vue.guardReactiveProps)((0, vue.unref)(form).slotProps.value))),
-				(0, vue.createVNode)(require_as_field.as_field_default, { field: __props.def.rootField }, null, 8, ["field"]),
+				((0, vue.openBlock)(), (0, vue.createBlock)(require_as_field.as_field_default, {
+					key: (0, vue.unref)(form).remountKey.value,
+					field: __props.def.rootField
+				}, null, 8, ["field"])),
 				(0, vue.renderSlot)(_ctx.$slots, "form.after", (0, vue.normalizeProps)((0, vue.guardReactiveProps)((0, vue.unref)(form).slotProps.value))),
 				(0, vue.unref)(form).formError.value ? (0, vue.renderSlot)(_ctx.$slots, "form.error", (0, vue.mergeProps)({ key: 0 }, (0, vue.unref)(form).slotProps.value, {
 					message: (0, vue.unref)(form).formError.value,

package/dist/{as-form-OsyP7m-A.mjs → as-form-me0zA-52.mjs}

@@ -1,10 +1,10 @@
 import { _ as TYPES_KEY, a as CHANGE_HANDLER_KEY, c as ERRORS_KEY, d as FORM_PATCH_KEY, f as FORM_STATE_KEY, g as ROOT_DATA_KEY, h as PATH_PREFIX_KEY, i as ACTION_HANDLER_KEY, l as FORM_CONTEXT_KEY, o as COMPONENTS_KEY, p as HIDE_ROOT_TITLE_KEY, s as DISMISS_EXTERNAL_AT_KEY, u as FORM_DATA_KEY } from "./use-form-context-D6J1WTyG.mjs";
 import { n as provideAsNestedSectionsStore, r as useAsNestedSectionsStore, t as DESCENDANT_ERROR_COUNTS_KEY } from "./use-as-nested-sections-store-DVRmG7V0.mjs";
 import { t as CLIENT_FACTORY_KEY } from "./use-as-value-help-DrISSxCz.mjs";
-import { t as as_field_default } from "./as-field-DLW-csEu.mjs";
-import { t as as_iterator_default } from "./as-iterator-DW7giLlz.mjs";
-import { computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, guardReactiveProps, inject, mergeProps, nextTick, normalizeProps, openBlock, provide, reactive, ref, renderSlot, toDisplayString, toRaw, toValue, unref, watch, watchEffect, withModifiers } from "vue";
-import { META_DESCRIPTION, META_LABEL, UI_FORM_FN_DESCRIPTION, UI_FORM_FN_SUBMIT_DISABLED, UI_FORM_FN_SUBMIT_TEXT, UI_FORM_FN_TITLE, UI_FORM_SUBMIT_TEXT, buildDescendantErrorCounts, buildFormDiff, getDeclaredFormActions, getFormValidator, iteratePathAncestors, mergeErrorMaps, resolveFormProp } from "@atscript/ui";
+import { t as as_field_default } from "./as-field-5rz47opo.mjs";
+import { t as as_iterator_default } from "./as-iterator-BjIF-O-J.mjs";
+import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, guardReactiveProps, inject, mergeProps, nextTick, normalizeProps, openBlock, provide, reactive, ref, renderSlot, toDisplayString, toRaw, toValue, unref, watch, watchEffect, withModifiers } from "vue";
+import { META_DESCRIPTION, META_LABEL, UI_FORM_FN_DESCRIPTION, UI_FORM_FN_SUBMIT_DISABLED, UI_FORM_FN_SUBMIT_TEXT, UI_FORM_FN_TITLE, UI_FORM_SUBMIT_TEXT, buildDescendantErrorCounts, buildFormDiff, buildFormRebase, collectDirtyPaths, deepClone, getDeclaredFormActions, getFormValidator, iteratePathAncestors, mergeErrorMaps, resolveFormProp, setByPath, unionVariantChanged } from "@atscript/ui";
 //#region src/composables/use-as-form-patch.ts
 /**
 * Internal factory invoked by `useAsForm` when `trackChanges` is enabled. Owns
@@ -35,14 +35,22 @@ import { META_DESCRIPTION, META_LABEL, UI_FORM_FN_DESCRIPTION, UI_FORM_FN_SUBMIT
 * data (`dataRev`) or the baseline (`baselineRev`) changes, and Vue caches the
 * result between reads.
 *
-* @param def      getter for the form's `FormDef`
-* @param getData  getter for the WRAPPED form-data container `{ value }`. Before
-*                 real domain data arrives `useAsForm` yields the empty internal
-*                 fallback `{}` (no `value` key); the tracker treats that as
-*                 "no data yet" and defers the baseline until a `{ value: … }`
-*                 container appears (the fetch-then-fill flow).
+* @param def       getter for the form's `FormDef`
+* @param getData   getter for the WRAPPED form-data container `{ value }`. Before
+*                  real domain data arrives `useAsForm` yields the empty internal
+*                  fallback `{}` (no `value` key); the tracker treats that as
+*                  "no data yet" and defers the baseline until a `{ value: … }`
+*                  container appears (the fetch-then-fill flow). The SAME
+*                  container reference is also the write target for
+*                  `rebaseOnto` — mutating its `.value` preserves the bound
+*                  `:form-data` identity so the deep watch fires once.
+* @param onRebased optional callback fired AFTER `rebaseOnto` rewrites the live
+*                  data, so the host can force-remount the field subtree (e.g.
+*                  bump a key) when a union variant changed — the variant picker
+*                  detects its index once at setup and won't re-detect on a
+*                  data swap. No-op for `rebase()` (which doesn't move data).
 */
-function createAsFormPatch(def, getData) {
+function createAsFormPatch(def, getData, onRebased) {
 	let baseline;
 	const baselineRev = ref(0);
 	const dataRev = ref(0);
@@ -57,7 +65,7 @@ function createAsFormPatch(def, getData) {
 	function snapshot() {
 		const cur = getData();
 		if (cur.value === void 0) return void 0;
-		return deepClone(toRaw(cur));
+		return deepClone(cur, toRaw);
 	}
 	function capture() {
 		baseline = snapshot();
@@ -87,46 +95,62 @@ function createAsFormPatch(def, getData) {
 	});
 	const isDirty = computed(() => diff.value.isDirty);
 	const changes = computed(() => diff.value.changes);
+	const dirtyPaths = computed(() => collectDirtyPaths(changes.value));
 	function getPatch(opts) {
 		if (baseline === void 0) return {};
-		const frozen = deepClone(toRaw(getData()));
+		const frozen = deepClone(getData(), toRaw);
 		return buildFormDiff(def(), baseline, frozen, opts).patch;
 	}
 	function getChanges() {
 		if (baseline === void 0) return [];
-		const frozen = deepClone(toRaw(getData()));
+		const frozen = deepClone(getData(), toRaw);
 		return buildFormDiff(def(), baseline, frozen).changes;
 	}
+	function isDirtyPath(path) {
+		return dirtyPaths.value.has(path);
+	}
 	function rebase() {
 		capture();
 	}
+	/**
+	* 3-way rebase onto a fresh upstream snapshot (see
+	* {@link AsFormPatchHandle.rebaseOnto}). One reactive write, then an explicit
+	* re-baseline to the upstream snapshot.
+	*/
+	function rebaseOnto(upstream, opts) {
+		const u = deepClone(upstream, toRaw);
+		if (baseline === void 0) {
+			const before = deepClone(getData(), toRaw);
+			setByPath(getData(), "", u.value);
+			if (unionVariantChanged(def(), before, u)) onRebased?.();
+			capture();
+			return {
+				conflicts: [],
+				reapplied: []
+			};
+		}
+		const current = deepClone(getData(), toRaw);
+		const { next, conflicts, reapplied } = buildFormRebase(def(), baseline, current, u, opts);
+		const variantMoved = unionVariantChanged(def(), current, next);
+		setByPath(getData(), "", next.value);
+		baseline = u;
+		baselineRev.value++;
+		if (variantMoved) onRebased?.();
+		return {
+			conflicts,
+			reapplied
+		};
+	}
 	return {
 		isDirty,
 		changes,
 		getPatch,
 		getChanges,
-		rebase
+		isDirtyPath,
+		rebase,
+		rebaseOnto
 	};
 }
-/**
-* Structural deep clone of plain JSON-ish data (objects / arrays / primitives /
-* Date). Used to freeze the baseline so later edits to the live form data don't
-* mutate it. `structuredClone` would throw on Vue proxies / functions; this
-* walks own-enumerable keys and copies leaves by value.
-*/
-function deepClone(value) {
-	if (value === null || typeof value !== "object") return value;
-	if (value instanceof Date) return new Date(value.getTime());
-	if (Array.isArray(value)) {
-		const out = [];
-		for (let i = 0; i < value.length; i++) out.push(deepClone(toRaw(value[i])));
-		return out;
-	}
-	const src = value;
-	const out = {};
-	for (const k of Object.keys(src)) out[k] = deepClone(toRaw(src[k]));
-	return out;
-}
 const NOT_TRACKING_MSG = "useAsFormPatch(): change tracking is not enabled on this form. Pass `track-changes` to <AsForm> (or `trackChanges: true` to useAsForm).";
 /**
 * Reactive read-only access to the form's change-tracking handle from any
@@ -295,6 +319,7 @@ function useAsState(opts) {
 const EMPTY_CHANGES = Object.freeze([]);
 const EMPTY_GET_PATCH = () => ({});
 const EMPTY_GET_CHANGES = () => [];
+const EMPTY_IS_DIRTY_PATH = () => false;
 /**
 * Composable backing `<AsForm>`. Owns the entire form state machine —
 * data container, internal validator, external-error dismissal, action
@@ -330,7 +355,10 @@ function useAsForm(options) {
 			context: formContext.value ?? {}
 		})
 	});
-	const patch = options.trackChanges?.() ? createAsFormPatch(() => options.def(), () => data.value) : void 0;
+	const remountKey = ref(0);
+	const patch = options.trackChanges?.() ? createAsFormPatch(() => options.def(), () => data.value, () => {
+		remountKey.value++;
+	}) : void 0;
 	if (patch) provide(FORM_PATCH_KEY, patch);
 	const reset = patch ? async () => {
 		await resetState();
@@ -386,7 +414,8 @@ function useAsForm(options) {
 		isDirty: patch?.isDirty.value ?? false,
 		changes: patch ? patch.changes.value : EMPTY_CHANGES,
 		getPatch: patch ? patch.getPatch : EMPTY_GET_PATCH,
-		getChanges: patch ? patch.getChanges : EMPTY_GET_CHANGES
+		getChanges: patch ? patch.getChanges : EMPTY_GET_CHANGES,
+		isDirtyPath: patch ? patch.isDirtyPath : EMPTY_IS_DIRTY_PATH
 	}));
 	function supportsAction(def, actionId) {
 		return getDeclaredFormActions(def).some((a) => a.id === actionId);
@@ -446,7 +475,8 @@ function useAsForm(options) {
 		dismissFormError: ext.dismissForm,
 		formContext,
 		handleChange,
-		patch
+		patch,
+		remountKey
 	};
 }
 //#endregion
@@ -561,7 +591,12 @@ var as_form_default = /* @__PURE__ */ defineComponent({
 			},
 			getPatch: form.patch ? form.patch.getPatch : () => ({}),
 			getChanges: form.patch ? form.patch.getChanges : () => [],
-			rebase: form.patch ? form.patch.rebase : () => {}
+			isDirtyPath: form.patch ? form.patch.isDirtyPath : () => false,
+			rebase: form.patch ? form.patch.rebase : () => {},
+			rebaseOnto: form.patch ? form.patch.rebaseOnto : () => ({
+				conflicts: [],
+				reapplied: []
+			})
 		});
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("form", {
@@ -571,7 +606,10 @@ var as_form_default = /* @__PURE__ */ defineComponent({
 			}, [
 				renderSlot(_ctx.$slots, "form.header", normalizeProps(guardReactiveProps(unref(form).slotProps.value))),
 				renderSlot(_ctx.$slots, "form.before", normalizeProps(guardReactiveProps(unref(form).slotProps.value))),
-				createVNode(as_field_default, { field: __props.def.rootField }, null, 8, ["field"]),
+				(openBlock(), createBlock(as_field_default, {
+					key: unref(form).remountKey.value,
+					field: __props.def.rootField
+				}, null, 8, ["field"])),
 				renderSlot(_ctx.$slots, "form.after", normalizeProps(guardReactiveProps(unref(form).slotProps.value))),
 				unref(form).formError.value ? renderSlot(_ctx.$slots, "form.error", mergeProps({ key: 0 }, unref(form).slotProps.value, {
 					message: unref(form).formError.value,

package/dist/as-form.cjs

@@ -1,2 +1,2 @@
-const require_as_form = require("./as-form-CrMA0HdQ.cjs");
+const require_as_form = require("./as-form-B4DKpAVk.cjs");
 module.exports = require_as_form.as_form_default;

package/dist/as-form.d.cts

@@ -1,2 +1,2 @@
-import { n as _default, t as Props } from "./as-form.vue-Dg_5GYWG.cjs";
+import { n as _default, t as Props } from "./as-form.vue-D5d1Y2ff.cjs";
 export { Props, _default as default };

package/dist/as-form.d.mts

@@ -1,2 +1,2 @@
-import { n as _default, t as Props } from "./as-form.vue-2NZSk1F9.mjs";
+import { n as _default, t as Props } from "./as-form.vue-DH3phgWP.mjs";
 export { Props, _default as default };

package/dist/as-form.mjs

@@ -1,2 +1,2 @@
-import { t as as_form_default } from "./as-form-OsyP7m-A.mjs";
+import { t as as_form_default } from "./as-form-me0zA-52.mjs";
 export { as_form_default as default };