attaform 0.16.2 → 0.16.4

package/dist/shared/{attaform.C9Ph2SMx.cjs → attaform.fegmBJaq.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 const vue = require('vue');
-const paths = require('./attaform.c_NzdRyc.cjs');
+const paths = require('./attaform.CIwZtbGV.cjs');
 const plugin = require('./attaform.rIRYSUI1.cjs');
 
 function isDescendable(value) {
@@ -415,20 +415,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 } = paths.canonicalizePath(pathInput);
     const cached = cache.get(key);
     if (cached !== void 0) return cached;
     const c = vue.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;
@@ -472,7 +472,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(paths.canonicalizePath(segments).key)?.value;
@@ -538,6 +542,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();
@@ -547,7 +560,7 @@ function aggregateErrorsAt(state, prefix) {
       const segs = paths.segmentsForPathKey(pathKey);
       if (segs === null) continue;
       if (!paths.isPathPrefix(prefix, segs)) continue;
-      if (segs.length > 0 && !hasAtPath(formValue, segs)) continue;
+      if (pathKey === paths.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]);
@@ -868,6 +881,8 @@ const FIELD_STATE_KEYS = /* @__PURE__ */ new Set([
   "errors",
   "validating",
   "valid",
+  "showErrors",
+  "firstError",
   "path",
   "blank",
   "label",
@@ -875,8 +890,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 = {};
@@ -2075,13 +2090,13 @@ function buildFormApi(state, formInstanceId, options = {}) {
   }
   function setFormErrors(errors) {
     if (errors.length === 0) {
-      state.userErrors.delete(paths.ROOT_PATH_KEY);
+      state.userErrors.delete(paths.FORM_ERRORS_PATH_KEY);
       return;
     }
     state.userErrors.set(
-      paths.ROOT_PATH_KEY,
+      paths.FORM_ERRORS_PATH_KEY,
       errors.map((e) => ({
-        path: [],
+        path: [...paths.FORM_ERRORS_PATH],
         message: e.message,
         formKey: state.formKey,
         code: e.code ?? "atta:form-error"
@@ -2089,7 +2104,7 @@ function buildFormApi(state, formInstanceId, options = {}) {
     );
   }
   function clearFormErrors() {
-    state.userErrors.delete(paths.ROOT_PATH_KEY);
+    state.userErrors.delete(paths.FORM_ERRORS_PATH_KEY);
   }
   const submitting = vue.computed(() => state.submitting.value);
   const submitCount = vue.computed(() => state.submitCount.value);
@@ -2107,7 +2122,20 @@ function buildFormApi(state, formInstanceId, options = {}) {
   const metaErrors = vue.computed(
     () => aggregateErrorsAt(state, [])
   );
-  const getRootFieldStateAt = buildFieldStateAccessor(state);
+  const getFormMetaBase = () => {
+    const rootBase = buildContainerFieldStateBase(state, paths.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 = vue.readonly(
     vue.reactive({
@@ -2143,6 +2171,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: vue.computed(() => rootFieldState.value.showErrors),
+      firstError: vue.computed(() => rootFieldState.value.firstError),
       path: vue.computed(() => rootFieldState.value.path),
       blank: vue.computed(() => rootFieldState.value.blank),
       label: vue.computed(() => rootFieldState.value.label),
@@ -2209,6 +2244,10 @@ function buildFormApi(state, formInstanceId, options = {}) {
     const segments = paths.canonicalizePath(pathInput).segments;
     await persistence.clearPersistedDraft(segments);
   };
+  function touch(pathInput) {
+    const segments = pathInput === void 0 ? paths.ROOT_PATH : paths.canonicalizePath(pathInput).segments;
+    state.touchAtPath(segments);
+  }
   const focusFirstError = (options2) => {
     const target = state.getFirstErrorElement(formInstanceId);
     if (target === null) return false;
@@ -2226,7 +2265,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
@@ -2255,6 +2294,7 @@ function buildFormApi(state, formInstanceId, options = {}) {
     clearPersistedDraft,
     focusFirstError,
     scrollToFirstError,
+    touch,
     undo,
     redo,
     append: fieldArrays.append,
@@ -2268,6 +2308,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;
@@ -2312,6 +2362,9 @@ function createFormStore(options) {
   const resetListeners = /* @__PURE__ */ new Set();
   const persistOptIns = plugin.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);
@@ -2741,9 +2794,20 @@ function createFormStore(options) {
   function getValueAtPath(path) {
     return getAtPath(form.value, path);
   }
+  function rerouteFormLevelEntry(err) {
+    if (err.path.length === 0) {
+      return { ...err, path: [...paths.FORM_ERRORS_PATH] };
+    }
+    return err;
+  }
+  function pathKeyForEntry(err) {
+    if (err.path.length === 0) return paths.FORM_ERRORS_PATH_KEY;
+    return paths.canonicalizePath(err.path).key;
+  }
   function appendErrorsTo(map, entries) {
-    for (const err of entries) {
-      const { key } = paths.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]);
@@ -2773,16 +2837,18 @@ function createFormStore(options) {
     schemaErrors.set(key, [...entries]);
   }
   function applySchemaErrorsForSubtree(path, entries) {
-    const { key: parentKey } = paths.canonicalizePath(path);
+    const parentKey = path.length === 0 ? paths.FORM_ERRORS_PATH_KEY : paths.canonicalizePath(path).key;
     const grouped = /* @__PURE__ */ new Map();
-    for (const err of entries) {
-      const { key } = paths.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);
       }
@@ -2879,6 +2945,24 @@ function createFormStore(options) {
     const { key } = paths.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 = paths.canonicalizePath(entry.segments).key;
+      const current = fields.get(leafKey);
+      if (current?.touched === true) continue;
+      touchFieldRecord(leafKey, entry.segments, { touched: true });
+    }
+    if (!touchedAny && plugin.__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,
@@ -3055,6 +3139,7 @@ function createFormStore(options) {
     originals,
     schema,
     ssr,
+    shouldShowErrors: resolvedShouldShowErrors,
     submitting,
     activeSubmissions,
     submitCount,
@@ -3081,6 +3166,7 @@ function createFormStore(options) {
     deregisterElement,
     markFocused,
     markTouched,
+    touchAtPath,
     markConnectedOptimistically,
     isPristineAtPath,
     getFieldRecord,
@@ -3273,6 +3359,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 },
@@ -3281,7 +3368,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";
@@ -3304,6 +3392,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);
@@ -3686,6 +3775,7 @@ function warnIfAmbientProviderHadDuplicates() {
 
 exports.AttaformErrorCode = AttaformErrorCode;
 exports.defaultCoercionRules = defaultCoercionRules;
+exports.defaultShouldShowErrors = defaultShouldShowErrors;
 exports.defineCoercion = defineCoercion;
 exports.getAtPath = getAtPath;
 exports.humanize = humanize;
@@ -3696,4 +3786,4 @@ exports.setAtPath = setAtPath;
 exports.slimKindOf = slimKindOf;
 exports.unset = unset;
 exports.useAbstractForm = useAbstractForm;
-//# sourceMappingURL=attaform.C9Ph2SMx.cjs.map
+//# sourceMappingURL=attaform.fegmBJaq.cjs.map