attaform 0.16.2 → 0.16.4

package/dist/shared/{attaform.DILbdvfo.mjs → attaform.DyV1O4tI.mjs}

@@ -1,5 +1,5 @@
 import { computed, ref, watchEffect, getCurrentScope, onScopeDispose, shallowReadonly, readonly, reactive, watch, markRaw, shallowRef, getCurrentInstance, provide, useId, toRaw, inject } from 'vue';
-import { s as segmentsForPathKey, i as isPathPrefix, c as canonicalizePath, a as ROOT_PATH_KEY } from './attaform.jrxE_xZw.mjs';
+import { s as segmentsForPathKey, i as isPathPrefix, F as FORM_ERRORS_PATH_KEY, c as canonicalizePath, R as ROOT_PATH, b as FORM_ERRORS_PATH } from './attaform.DZRj9s0s.mjs';
 import { _ as __DEV__, e as SubmitErrorHandlerError, A as AnonPersistError, m as captureUserCallSite, n as enforceSensitiveCheck, o as createPersistOptInRegistry, b as InvalidUseFormConfigError, p as ensureAttaformInstalled, l as useRegistry, q as kFormContext, r as kFormInstanceId, d as ReservedFormKeyError } from './attaform.BfMxsfmE.mjs';
 
 function isDescendable(value) {
@@ -413,20 +413,20 @@ function setAtPathWithSchemaFillImpl(root, schema, fullPath, value, startIdx) {
   return rec;
 }
 
-function buildFieldStateAccessor(state) {
+function buildFieldStateAccessor(state, getFormMetaBase) {
   const cache = /* @__PURE__ */ new Map();
   return function getFieldState(pathInput) {
     const { segments, key } = canonicalizePath(pathInput);
     const cached = cache.get(key);
     if (cached !== void 0) return cached;
     const c = computed(
-      () => state.schema.isLeafAtPath(segments) ? buildLeafFieldState(state, segments, key) : buildContainerFieldState(state, segments)
+      () => state.schema.isLeafAtPath(segments) ? buildLeafFieldState(state, segments, key, getFormMetaBase) : buildContainerFieldState(state, segments, key, getFormMetaBase)
     );
     cache.set(key, c);
     return c;
   };
 }
-function buildLeafFieldState(state, segments, key) {
+function buildLeafFieldStateBase(state, segments, key) {
   const record = state.fields.get(key);
   const value = state.getValueAtPath(segments);
   const original = state.originals.get(key)?.value;
@@ -470,7 +470,11 @@ function buildLeafFieldState(state, segments, key) {
     meta: resolved.meta
   };
 }
-function buildContainerFieldState(state, segments, _key) {
+function buildLeafFieldState(state, segments, key, getFormMetaBase) {
+  const base = buildLeafFieldStateBase(state, segments, key);
+  return decorateWithDerivedProps(base, state, getFormMetaBase);
+}
+function buildContainerFieldStateBase(state, segments, _key) {
   const formValue = state.form.value;
   const value = state.getValueAtPath(segments);
   const original = state.originals.get(canonicalizePath(segments).key)?.value;
@@ -536,6 +540,15 @@ function buildContainerFieldState(state, segments, _key) {
     meta: resolved.meta
   };
 }
+function buildContainerFieldState(state, segments, key, getFormMetaBase) {
+  const base = buildContainerFieldStateBase(state, segments);
+  return decorateWithDerivedProps(base, state, getFormMetaBase);
+}
+function decorateWithDerivedProps(base, state, getFormMetaBase) {
+  const firstError = base.errors[0];
+  const showErrors = base.errors.length > 0 && state.shouldShowErrors(base, getFormMetaBase());
+  return { ...base, showErrors, firstError };
+}
 function aggregateErrorsAt(state, prefix) {
   const formValue = state.form.value;
   const buckets = /* @__PURE__ */ new Map();
@@ -545,7 +558,7 @@ function aggregateErrorsAt(state, prefix) {
       const segs = segmentsForPathKey(pathKey);
       if (segs === null) continue;
       if (!isPathPrefix(prefix, segs)) continue;
-      if (segs.length > 0 && !hasAtPath(formValue, segs)) continue;
+      if (pathKey === FORM_ERRORS_PATH_KEY) ; else if (segs.length > 0 && !hasAtPath(formValue, segs)) continue;
       const ordinal = state.ensurePathOrdinal(pathKey);
       const existing = buckets.get(ordinal);
       if (existing === void 0) buckets.set(ordinal, [...list]);
@@ -866,6 +879,8 @@ const FIELD_STATE_KEYS = /* @__PURE__ */ new Set([
   "errors",
   "validating",
   "valid",
+  "showErrors",
+  "firstError",
   "path",
   "blank",
   "label",
@@ -873,8 +888,8 @@ const FIELD_STATE_KEYS = /* @__PURE__ */ new Set([
   "placeholder",
   "meta"
 ]);
-function buildFieldStateProxy(state) {
-  const getFieldStateAt = buildFieldStateAccessor(state);
+function buildFieldStateProxy(state, getFormMetaBase) {
+  const getFieldStateAt = buildFieldStateAccessor(state, getFormMetaBase);
   const snapshotFieldStateAt = (path) => {
     const view = getFieldStateAt(path).value;
     const snapshot = {};
@@ -2073,13 +2088,13 @@ function buildFormApi(state, formInstanceId, options = {}) {
   }
   function setFormErrors(errors) {
     if (errors.length === 0) {
-      state.userErrors.delete(ROOT_PATH_KEY);
+      state.userErrors.delete(FORM_ERRORS_PATH_KEY);
       return;
     }
     state.userErrors.set(
-      ROOT_PATH_KEY,
+      FORM_ERRORS_PATH_KEY,
       errors.map((e) => ({
-        path: [],
+        path: [...FORM_ERRORS_PATH],
         message: e.message,
         formKey: state.formKey,
         code: e.code ?? "atta:form-error"
@@ -2087,7 +2102,7 @@ function buildFormApi(state, formInstanceId, options = {}) {
     );
   }
   function clearFormErrors() {
-    state.userErrors.delete(ROOT_PATH_KEY);
+    state.userErrors.delete(FORM_ERRORS_PATH_KEY);
   }
   const submitting = computed(() => state.submitting.value);
   const submitCount = computed(() => state.submitCount.value);
@@ -2105,7 +2120,20 @@ function buildFormApi(state, formInstanceId, options = {}) {
   const metaErrors = computed(
     () => aggregateErrorsAt(state, [])
   );
-  const getRootFieldStateAt = buildFieldStateAccessor(state);
+  const getFormMetaBase = () => {
+    const rootBase = buildContainerFieldStateBase(state, ROOT_PATH);
+    return {
+      ...rootBase,
+      submitting: state.submitting.value,
+      submitCount: state.submitCount.value,
+      submitError: state.submitError.value,
+      canUndo: canUndo.value,
+      canRedo: canRedo.value,
+      historySize: historySize.value,
+      instanceId: formInstanceId
+    };
+  };
+  const getRootFieldStateAt = buildFieldStateAccessor(state, getFormMetaBase);
   const rootFieldState = getRootFieldStateAt([]);
   const formMeta = readonly(
     reactive({
@@ -2141,6 +2169,13 @@ function buildFormApi(state, formInstanceId, options = {}) {
       // keep the explicit form-level computation for the gate.
       valid,
       errors: metaErrors,
+      // `showErrors` / `firstError` flow through the same root
+      // field-state computed as the rest of the FieldState surface,
+      // so `form.meta.showErrors` matches `form.fields().showErrors`
+      // exactly — the predicate runs once at the root and the result
+      // is shared.
+      showErrors: computed(() => rootFieldState.value.showErrors),
+      firstError: computed(() => rootFieldState.value.firstError),
       path: computed(() => rootFieldState.value.path),
       blank: computed(() => rootFieldState.value.blank),
       label: computed(() => rootFieldState.value.label),
@@ -2207,6 +2242,10 @@ function buildFormApi(state, formInstanceId, options = {}) {
     const segments = canonicalizePath(pathInput).segments;
     await persistence.clearPersistedDraft(segments);
   };
+  function touch(pathInput) {
+    const segments = pathInput === void 0 ? ROOT_PATH : canonicalizePath(pathInput).segments;
+    state.touchAtPath(segments);
+  }
   const focusFirstError = (options2) => {
     const target = state.getFirstErrorElement(formInstanceId);
     if (target === null) return false;
@@ -2224,7 +2263,7 @@ function buildFormApi(state, formInstanceId, options = {}) {
     return readonlySetSnapshot(state.blankPaths);
   });
   const valuesProxy = buildValuesProxy(state.form);
-  const fieldStateProxy = buildFieldStateProxy(state);
+  const fieldStateProxy = buildFieldStateProxy(state, getFormMetaBase);
   return {
     handleSubmit,
     // `values` is the callable readonly Proxy. Each `get` trap reads
@@ -2253,6 +2292,7 @@ function buildFormApi(state, formInstanceId, options = {}) {
     clearPersistedDraft,
     focusFirstError,
     scrollToFirstError,
+    touch,
     undo,
     redo,
     append: fieldArrays.append,
@@ -2266,6 +2306,16 @@ function buildFormApi(state, formInstanceId, options = {}) {
   };
 }
 
+const defaultShouldShowErrors = (field, formMeta) => formMeta.submitCount > 0 || field.touched === true && field.dirty;
+const SHOW_ALWAYS = () => true;
+const SHOW_NEVER = () => false;
+function resolveShouldShowErrors(config) {
+  if (config === void 0) return defaultShouldShowErrors;
+  if (config === true) return SHOW_ALWAYS;
+  if (config === false) return SHOW_NEVER;
+  return config;
+}
+
 function isHydratedFieldRecord(value) {
   if (typeof value !== "object" || value === null) return false;
   const r = value;
@@ -2310,6 +2360,9 @@ function createFormStore(options) {
   const resetListeners = /* @__PURE__ */ new Set();
   const persistOptIns = createPersistOptInRegistry();
   const coerceIndex = resolveCoercionIndex(options.coerce);
+  const resolvedShouldShowErrors = resolveShouldShowErrors(
+    options.shouldShowErrors
+  );
   const cleanupHooks = [];
   const modules = /* @__PURE__ */ new Map();
   const completedConstraints = defaultValues === void 0 ? void 0 : mergeStructural(schema, [], defaultValues);
@@ -2739,9 +2792,20 @@ function createFormStore(options) {
   function getValueAtPath(path) {
     return getAtPath(form.value, path);
   }
+  function rerouteFormLevelEntry(err) {
+    if (err.path.length === 0) {
+      return { ...err, path: [...FORM_ERRORS_PATH] };
+    }
+    return err;
+  }
+  function pathKeyForEntry(err) {
+    if (err.path.length === 0) return FORM_ERRORS_PATH_KEY;
+    return canonicalizePath(err.path).key;
+  }
   function appendErrorsTo(map, entries) {
-    for (const err of entries) {
-      const { key } = canonicalizePath(err.path);
+    for (const raw of entries) {
+      const err = rerouteFormLevelEntry(raw);
+      const key = pathKeyForEntry(err);
       const current = map.get(key);
       if (current === void 0) {
         map.set(key, [err]);
@@ -2771,16 +2835,18 @@ function createFormStore(options) {
     schemaErrors.set(key, [...entries]);
   }
   function applySchemaErrorsForSubtree(path, entries) {
-    const { key: parentKey } = canonicalizePath(path);
+    const parentKey = path.length === 0 ? FORM_ERRORS_PATH_KEY : canonicalizePath(path).key;
     const grouped = /* @__PURE__ */ new Map();
-    for (const err of entries) {
-      const { key } = canonicalizePath(err.path);
+    for (const raw of entries) {
+      const err = rerouteFormLevelEntry(raw);
+      const key = pathKeyForEntry(err);
       const list = grouped.get(key);
       if (list === void 0) grouped.set(key, [err]);
       else list.push(err);
     }
     if (!grouped.has(parentKey)) schemaErrors.delete(parentKey);
     for (const existingKey of [...schemaErrors.keys()]) {
+      if (existingKey === parentKey) continue;
       if (isPathKeyUnder(existingKey, path) && !grouped.has(existingKey)) {
         schemaErrors.delete(existingKey);
       }
@@ -2877,6 +2943,24 @@ function createFormStore(options) {
     const { key } = canonicalizePath(path);
     touchFieldRecord(key, path, { touched: true });
   }
+  function touchAtPath(segments) {
+    const formValue = form.value;
+    let touchedAny = false;
+    for (const [, entry] of originals) {
+      if (!isPathPrefix(segments, entry.segments)) continue;
+      if (!hasAtPath(formValue, entry.segments)) continue;
+      touchedAny = true;
+      const leafKey = canonicalizePath(entry.segments).key;
+      const current = fields.get(leafKey);
+      if (current?.touched === true) continue;
+      touchFieldRecord(leafKey, entry.segments, { touched: true });
+    }
+    if (!touchedAny && __DEV__) {
+      console.warn(
+        `[attaform] form.touch(): no fields resolved at path ${JSON.stringify(segments)}. Check the path matches an existing field or container.`
+      );
+    }
+  }
   function reset(nextDefaultValues) {
     const next = schema.getDefaultValues({
       useDefaultSchemaValues: true,
@@ -3053,6 +3137,7 @@ function createFormStore(options) {
     originals,
     schema,
     ssr,
+    shouldShowErrors: resolvedShouldShowErrors,
     submitting,
     activeSubmissions,
     submitCount,
@@ -3079,6 +3164,7 @@ function createFormStore(options) {
     deregisterElement,
     markFocused,
     markTouched,
+    touchAtPath,
     markConnectedOptimistically,
     isPristineAtPath,
     getFieldRecord,
@@ -3271,6 +3357,7 @@ function mergeWithDefaults(defaults, configuration) {
   const coerce = configuration.coerce ?? defaults.coerce;
   const validateOn = configuration.validateOn ?? defaults.validateOn;
   const debounceMs = configuration.debounceMs ?? defaults.debounceMs;
+  const shouldShowErrors = configuration.shouldShowErrors ?? defaults.shouldShowErrors;
   return {
     ...configuration,
     ...strict === void 0 ? {} : { strict },
@@ -3279,7 +3366,8 @@ function mergeWithDefaults(defaults, configuration) {
     ...rememberVariants === void 0 ? {} : { rememberVariants },
     ...coerce === void 0 ? {} : { coerce },
     ...validateOn === void 0 ? {} : { validateOn },
-    ...debounceMs === void 0 ? {} : { debounceMs }
+    ...debounceMs === void 0 ? {} : { debounceMs },
+    ...shouldShowErrors === void 0 ? {} : { shouldShowErrors }
   };
 }
 const HISTORY_MODULE_KEY = "history";
@@ -3302,6 +3390,7 @@ function buildFreshState(key, schema, configuration, registry) {
     ssr: registry.ssr,
     ...configuration.rememberVariants !== void 0 ? { rememberVariants: configuration.rememberVariants } : {},
     ...configuration.coerce !== void 0 ? { coerce: configuration.coerce } : {},
+    ...configuration.shouldShowErrors !== void 0 ? { shouldShowErrors: configuration.shouldShowErrors } : {},
     ...initialBlankPaths !== void 0 ? { initialBlankPaths } : {}
   };
   const state = createFormStore(createOptions);
@@ -3682,5 +3771,5 @@ function warnIfAmbientProviderHadDuplicates() {
   }
 }
 
-export { AttaformErrorCode as A, isUnset as a, defineCoercion as b, useAbstractForm as c, defaultCoercionRules as d, setAtPath as e, isPlainRecord as f, getAtPath as g, humanize as h, injectForm as i, slimKindOf as s, unset as u };
-//# sourceMappingURL=attaform.DILbdvfo.mjs.map
+export { AttaformErrorCode as A, isUnset as a, defaultShouldShowErrors as b, defineCoercion as c, defaultCoercionRules as d, useAbstractForm as e, setAtPath as f, getAtPath as g, humanize as h, injectForm as i, isPlainRecord as j, slimKindOf as s, unset as u };
+//# sourceMappingURL=attaform.DyV1O4tI.mjs.map