@m4l/components 9.82.0 → 9.82.1-beta-hotfix-790-m4l-components-dynamic-form-validation.0

package/components/DynamicForm/DynamicForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DynamicForm.d.ts","sourceRoot":"","sources":["../../../../../../packages/components/src/components/DynamicForm/DynamicForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqF,MAAM,OAAO,CAAC;AAU1G,OAAO,EAEL,gBAAgB,EAChB,cAAc,EAGf,MAAM,SAAS,CAAC;AAYjB;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,WAAW,yFA2RtB,CAAC"}
+{"version":3,"file":"DynamicForm.d.ts","sourceRoot":"","sources":["../../../../../../packages/components/src/components/DynamicForm/DynamicForm.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqF,MAAM,OAAO,CAAC;AAU1G,OAAO,EAEL,gBAAgB,EAChB,cAAc,EAGf,MAAM,SAAS,CAAC;AAYjB;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,WAAW,yFAiStB,CAAC"}

package/components/DynamicForm/DynamicForm.js

@@ -1,6 +1,6 @@
-import { jsx as r } from "@emotion/react/jsx-runtime";
-import Z, { forwardRef as $, useMemo as c, useState as tt, useEffect as et, useImperativeHandle as ot, useCallback as N } from "react";
-import P from "clsx";
+import { jsx as i } from "@emotion/react/jsx-runtime";
+import Z, { forwardRef as $, useMemo as c, useState as tt, useEffect as et, useImperativeHandle as ot, useCallback as P } from "react";
+import T from "clsx";
 import { useModuleSkeleton as rt } from "@m4l/core";
 import { useComponentSize as it } from "../../hooks/useComponentSize/index.js";
 import { TEST_PROP_ID as st } from "../../test/constants_no_mock.js";
@@ -9,24 +9,24 @@ import { DynamicFormContentRootStyled as at, DynamicFormFormProviderStyled as mt
 import { DYNAMIC_FORM_CLASSES as b, EMPTY_DATA as ut } from "./constants.js";
 import { useDynamicForm as dt } from "./hooks/useDynamicForm/useDynamicForm.js";
 import { useDynamicFormData as lt } from "./hooks/useDynamicFormData/useDynamicFormData.js";
-import { DynamicFormContent as T } from "./subcomponents/DynamicFormContent/DynamicFormContent.js";
+import { DynamicFormContent as C } from "./subcomponents/DynamicFormContent/DynamicFormContent.js";
 import { useFieldsWithFetchedOptions as ct } from "./hooks/useFieldsWithFetchedOptions/useFieldsWithFetchedOptions.js";
 import { filterUnknownFieldsFromSubmit as ft } from "./helpers/filterUnknownFieldsFromSubmit/filterUnknownFieldsFromSubmit.js";
-import { mapOptionFieldValuesForSubmit as pt } from "./helpers/mapOptionFieldValuesForSubmit/mapOptionFieldValuesForSubmit.js";
-import { normalizeDynamicFormFields as St } from "./helpers/resolveFormSections/resolveFormSections.js";
-const Ft = $((C, k) => {
+import { normalizeDynamicFormFields as pt } from "./helpers/resolveFormSections/resolveFormSections.js";
+import { mapOptionFieldValuesForSubmit as St } from "./helpers/mapOptionFieldValuesForSubmit/mapOptionFieldValuesForSubmit.js";
+const Ft = $((k, z) => {
   const {
-    formId: z,
-    formInstanceId: _,
-    inputEndpoint: A,
-    outputEndpoint: i,
-    submitMode: s,
+    formId: _,
+    formInstanceId: A,
+    inputEndpoint: H,
+    outputEndpoint: s,
+    submitMode: t,
     initialData: D,
-    formatInputData: H,
-    formatOutputData: L,
+    formatInputData: L,
+    formatOutputData: g,
     onSubmit: n,
     onSubmitError: y,
-    size: g,
+    size: x,
     readOnly: a = !1,
     suppressFormHeader: h = !0,
     className: v,
@@ -35,39 +35,39 @@ const Ft = $((C, k) => {
     fieldWrapperClassName: E,
     fieldFlow: u = "responsiveWrap",
     coupled: p = !1,
-    coupledStatusLoad: x,
-    actionFormIntroProps: W,
-    renderActions: V
-  } = C, { currentSize: d } = it(g), U = rt(), {
-    formData: Y,
+    coupledStatusLoad: W,
+    actionFormIntroProps: V,
+    renderActions: U
+  } = k, { currentSize: d } = it(x), Y = rt(), {
+    formData: j,
     statusLoad: I,
     handleSubmit: w
   } = lt({
-    formId: z,
-    formInstanceId: _,
-    inputEndpoint: A,
-    outputEndpoint: i,
-    submitMode: s,
+    formId: _,
+    formInstanceId: A,
+    inputEndpoint: H,
+    outputEndpoint: s,
+    submitMode: t,
     initialData: D,
-    formatInputData: H,
-    formatOutputData: L,
+    formatInputData: L,
+    formatOutputData: g,
     onSubmit: n
-  }), e = Y || D, S = c(
-    () => St(e?.fields),
-    [e?.fields]
+  }), o = j || D, S = c(
+    () => pt(o?.fields),
+    [o?.fields]
   ), { fields: O } = ct({
     fields: S.fields
-  }), t = c(() => e && {
-    ...e,
+  }), e = c(() => o && {
+    ...o,
     fields: O
-  }, [O, e]), { initialValues: j, validationSchema: B } = dt(t || ut), [F, l] = tt(null);
+  }, [O, o]), { initialValues: B, validationSchema: q } = dt(e || ut), [F, l] = tt(null);
   et(() => {
     if (!F)
       return;
-    const o = setTimeout(() => l(null), 5e3);
-    return () => clearTimeout(o);
+    const r = setTimeout(() => l(null), 5e3);
+    return () => clearTimeout(r);
   }, [F]);
-  const q = c(() => ({
+  const G = c(() => ({
     size: d,
     readOnly: a,
     fieldFlow: u
@@ -80,43 +80,43 @@ const Ft = $((C, k) => {
     onSubmit: () => {
     }
   }), []);
-  ot(k, () => R.current ?? M, [M]);
-  const G = N(
-    async (o) => {
-      if (!!!(i || s === "perField" || n))
+  ot(z, () => R.current ?? M, [M]);
+  const J = P(
+    async (r) => {
+      if (!!!(s || t === "batch" || t === "perField" || n))
         return;
-      const K = i || s === "perField" ? w : n ?? (() => {
-      }), Q = ft(
-        o,
-        t?.fields ?? []
-      ), X = pt(Q, t?.fields ?? []);
+      const Q = s || t === "batch" || t === "perField" ? w : n ?? (() => {
+      }), N = ft(
+        r,
+        e?.fields ?? []
+      ), X = t === "batch" ? N : St(N, e?.fields ?? []);
       try {
-        await K(X), l("success");
+        await Q(X), l("success");
       } catch {
         l("error");
       }
     },
-    [w, n, i, t?.fields, s]
-  ), J = N(
-    (o) => {
-      l("error"), y?.(o);
+    [w, n, s, e?.fields, t]
+  ), K = P(
+    (r) => {
+      l("error"), y?.(r);
     },
     [y]
   );
-  return U ? /* @__PURE__ */ r(
+  return Y ? /* @__PURE__ */ i(
     at,
     {
-      ownerState: q,
-      className: P(v, b.contentRoot),
+      ownerState: G,
+      className: T(v, b.contentRoot),
       ...typeof m == "string" ? { "data-meta": m } : {},
       ...process.env.NODE_ENV !== "production" ? { [st]: f } : {},
-      children: /* @__PURE__ */ r(nt, {})
+      children: /* @__PURE__ */ i(nt, {})
     }
-  ) : t ? p ? /* @__PURE__ */ r(
-    T,
+  ) : e ? p ? /* @__PURE__ */ i(
+    C,
     {
-      data: t,
-      statusLoad: x,
+      data: e,
+      statusLoad: W,
       currentSize: d,
       fieldWrapperClassName: E,
       dataTestId: f,
@@ -127,21 +127,21 @@ const Ft = $((C, k) => {
       fieldFlow: u,
       contractIssues: S.issues
     }
-  ) : /* @__PURE__ */ r(
+  ) : /* @__PURE__ */ i(
     mt,
     {
       ref: R,
-      values: j,
-      validationSchema: B,
-      onSubmit: G,
-      onSubmitError: J,
+      values: B,
+      validationSchema: q,
+      onSubmit: J,
+      onSubmitError: K,
       statusLoad: I,
       mode: "onSubmit",
-      className: P(v, b.contentRoot, b.formProvider),
-      children: /* @__PURE__ */ r(
-        T,
+      className: T(v, b.contentRoot, b.formProvider),
+      children: /* @__PURE__ */ i(
+        C,
         {
-          data: t,
+          data: e,
           statusLoad: I,
           currentSize: d,
           fieldWrapperClassName: E,
@@ -152,8 +152,8 @@ const Ft = $((C, k) => {
           suppressFormHeader: h,
           fieldFlow: u,
           contractIssues: S.issues,
-          actionFormIntroProps: W,
-          renderActions: V,
+          actionFormIntroProps: V,
+          renderActions: U,
           submitFeedbackStatus: F
         }
       )

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/buildDynamicFormBatchPayload.d.ts

@@ -0,0 +1,11 @@
+import { Field } from '../../types';
+import { BuildDynamicFormBatchPayloadOptions, DynamicFormBatchPayload } from './types';
+/**
+ * Reject a draft that tries to clear a persisted answer because the batch API treats null or an
+ * absent typed value as no change. This check intentionally runs before option mapping can turn a
+ * null single selection into an empty array.
+ */
+export declare function assertNoUnsupportedBatchClear(data: Record<string, unknown>, fields: Field[]): void;
+/** Build the native typed body accepted by the atomic form-instance values endpoint. */
+export declare function buildDynamicFormBatchPayload(options: BuildDynamicFormBatchPayloadOptions): DynamicFormBatchPayload;
+//# sourceMappingURL=buildDynamicFormBatchPayload.d.ts.map

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/buildDynamicFormBatchPayload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildDynamicFormBatchPayload.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/helpers/buildDynamicFormBatchPayload/buildDynamicFormBatchPayload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAOzC,OAAO,KAAK,EACV,mCAAmC,EAEnC,uBAAuB,EAExB,MAAM,SAAS,CAAC;AAYjB;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,KAAK,EAAE,GACd,IAAI,CAyBN;AAqED,wFAAwF;AACxF,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,mCAAmC,GAC3C,uBAAuB,CAiDzB"}

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/buildDynamicFormBatchPayload.js

@@ -0,0 +1,64 @@
+import { DYNAMIC_FORM_BATCH_VALUE_KEYS as b } from "./constants.js";
+import { isKnownFieldComponent as d, isFieldExcludedFromSubmit as m } from "../filterUnknownFieldsFromSubmit/filterUnknownFieldsFromSubmit.js";
+import { getFieldTypeApiKey as u } from "../getFieldTypeApiKey/getFieldTypeApiKey.js";
+import { mapOptionFieldValuesForSubmit as p } from "../mapOptionFieldValuesForSubmit/mapOptionFieldValuesForSubmit.js";
+function y(e) {
+  return Array.isArray(e) ? e.length > 0 : e != null;
+}
+function h(e, i) {
+  for (const t of i) {
+    if (!d(t) || m(t) || typeof t.name != "string" || !(t.name in e))
+      continue;
+    const n = e[t.name], a = n === null && t.currentValue !== null, o = u(t) === "value_jsonb" && Array.isArray(n) && n.length === 0 && y(t.currentValue);
+    if (a || o)
+      throw new Error(
+        `DynamicForm batch cannot clear field ${t.id}; the endpoint treats empty values as no change.`
+      );
+  }
+}
+function F(e) {
+  return e !== null && typeof e == "object" && !Array.isArray(e) && Object.getPrototypeOf(e) === Object.prototype;
+}
+function f(e) {
+  return e === null || typeof e == "string" || typeof e == "boolean" ? !0 : typeof e == "number" ? Number.isFinite(e) : Array.isArray(e) ? e.every(f) : F(e) && Object.values(e).every(f);
+}
+function g(e, i, t) {
+  if (i === null)
+    return;
+  const n = () => {
+    throw new Error(`DynamicForm batch value is incompatible with ${e} for field ${t.id}.`);
+  };
+  e === "value_boolean" && typeof i != "boolean" && n(), e === "value_double" && (typeof i != "number" || !Number.isFinite(i)) && n(), e === "value_integer" && (typeof i != "number" || !Number.isSafeInteger(i)) && n(), e === "value_jsonb" && !f(i) && n(), e === "value_string" && typeof i != "string" && n();
+}
+function E(e) {
+  const { data: i, fields: t } = e;
+  h(i, t);
+  const n = p(i, t), a = /* @__PURE__ */ new Set(), o = [];
+  for (const r of t) {
+    if (!d(r) || m(r) || typeof r.name != "string" || !(r.name in n))
+      continue;
+    if (!Number.isSafeInteger(r.id))
+      throw new Error(`DynamicForm batch field id must be a safe integer: ${r.id}.`);
+    if (a.has(r.id))
+      throw new Error(`DynamicForm batch field id is duplicated: ${r.id}.`);
+    a.add(r.id);
+    const s = n[r.name];
+    if (s === void 0)
+      continue;
+    const c = u(r);
+    if (!b.has(c))
+      throw new Error(`DynamicForm field ${r.id} does not have a supported batch value key.`);
+    const l = c;
+    g(l, s, r), o.push({
+      form_field_id: r.id,
+      [l]: s
+    });
+  }
+  if (o.length === 0)
+    throw new Error("DynamicForm batch submit requires at least one eligible field value.");
+  return { fields: o };
+}
+export {
+  h as assertNoUnsupportedBatchClear,
+  E as buildDynamicFormBatchPayload
+};

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/constants.d.ts

@@ -0,0 +1,3 @@
+import { DynamicFormBatchValueKey } from './types';
+export declare const DYNAMIC_FORM_BATCH_VALUE_KEYS: Set<DynamicFormBatchValueKey>;
+//# sourceMappingURL=constants.d.ts.map

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/helpers/buildDynamicFormBatchPayload/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAExD,eAAO,MAAM,6BAA6B,+BAMxC,CAAC"}

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/constants.js

@@ -0,0 +1,10 @@
+const e = /* @__PURE__ */ new Set([
+  "value_boolean",
+  "value_double",
+  "value_integer",
+  "value_jsonb",
+  "value_string"
+]);
+export {
+  e as DYNAMIC_FORM_BATCH_VALUE_KEYS
+};

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/index.d.ts

@@ -0,0 +1,3 @@
+export * from './buildDynamicFormBatchPayload';
+export type * from './types';
+//# sourceMappingURL=index.d.ts.map

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/helpers/buildDynamicFormBatchPayload/index.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAC;AAC/C,mBAAmB,SAAS,CAAC"}

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/types.d.ts

@@ -0,0 +1,13 @@
+import { Field } from '../../types';
+export type DynamicFormBatchValueKey = 'value_boolean' | 'value_double' | 'value_integer' | 'value_jsonb' | 'value_string';
+export type DynamicFormBatchField = {
+    form_field_id: number;
+} & Partial<Record<DynamicFormBatchValueKey, unknown>>;
+export interface DynamicFormBatchPayload {
+    fields: DynamicFormBatchField[];
+}
+export interface BuildDynamicFormBatchPayloadOptions {
+    data: Record<string, unknown>;
+    fields: Field[];
+}
+//# sourceMappingURL=types.d.ts.map

package/components/DynamicForm/helpers/buildDynamicFormBatchPayload/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/helpers/buildDynamicFormBatchPayload/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,MAAM,wBAAwB,GAChC,eAAe,GACf,cAAc,GACd,eAAe,GACf,aAAa,GACb,cAAc,CAAC;AAEnB,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC,CAAC;AAEvD,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,qBAAqB,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,mCAAmC;IAClD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB"}

package/components/DynamicForm/helpers/createFieldValidationSchema/createFieldValidationSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createFieldValidationSchema.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/helpers/createFieldValidationSchema/createFieldValidationSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAmB,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAIzC,OAAO,KAAK,EAEV,+BAA+B,EAChC,MAAM,0BAA0B,CAAC;AA2DlC;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,GACrB,+BAA+B,CA4DjC"}
+{"version":3,"file":"createFieldValidationSchema.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/components/src/components/DynamicForm/helpers/createFieldValidationSchema/createFieldValidationSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAmB,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAIzC,OAAO,KAAK,EAEV,+BAA+B,EAChC,MAAM,0BAA0B,CAAC;AA2ElC;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,YAAY,GACrB,+BAA+B,CA8EjC"}

package/components/DynamicForm/helpers/createFieldValidationSchema/createFieldValidationSchema.js

@@ -1,65 +1,84 @@
-import * as f from "yup";
-import { DYNAMIC_FORM_DICTIONARY as l } from "../../dictionary.js";
-import { createBaseSchema as p } from "./strategies/baseSchema/createBaseSchema.js";
-import { VALIDATION_STRATEGY_REGISTRY as y } from "./strategies/validation/validationStrategies.js";
-import { isSupportedDynamicFormField as V } from "../fieldContractAllowlist/fieldContractAllowlist.js";
-import { resolveFieldMandatory as v } from "../resolveFieldContractAliases/resolveFieldContractAliases.js";
-import { applyRequiredValidation as A } from "../applyRequiredValidation/applyRequiredValidation.js";
-import { isRecord as u } from "../isRecord/isRecord.js";
-import { normalizeValidation as S } from "../normalizeValidation/normalizeValidation.js";
-function g(r, i) {
-  if (!(!u(r) || typeof r.id != "string" || r.id === ""))
+import * as y from "yup";
+import { DYNAMIC_FORM_DICTIONARY as c } from "../../dictionary.js";
+import { createBaseSchema as v } from "./strategies/baseSchema/createBaseSchema.js";
+import { VALIDATION_STRATEGY_REGISTRY as S } from "./strategies/validation/validationStrategies.js";
+import { isSupportedDynamicFormField as A } from "../fieldContractAllowlist/fieldContractAllowlist.js";
+import { resolveFieldMandatory as E } from "../resolveFieldContractAliases/resolveFieldContractAliases.js";
+import { applyRequiredValidation as R } from "../applyRequiredValidation/applyRequiredValidation.js";
+import { isRecord as p } from "../isRecord/isRecord.js";
+import { normalizeValidation as F } from "../normalizeValidation/normalizeValidation.js";
+import { resolveValidationErrorMessage as I } from "../resolveValidationErrorMessage/resolveValidationErrorMessage.js";
+function M(e, r) {
+  if (!(!p(e) || typeof e.id != "string" || e.id === ""))
     return {
-      id: r.id,
-      name: typeof r.name == "string" ? r.name : r.id,
-      requiresValue: typeof r.requiresValue == "boolean" ? r.requiresValue : i !== void 0,
-      errorMessageForm: typeof r.errorMessageForm == "string" ? r.errorMessageForm : ""
+      id: e.id,
+      name: typeof e.name == "string" ? e.name : e.id,
+      requiresValue: typeof e.requiresValue == "boolean" ? e.requiresValue : r !== void 0,
+      errorMessageForm: typeof e.errorMessageForm == "string" ? e.errorMessageForm : ""
     };
 }
-function F(r) {
-  if (!u(r) || r.isActive !== !0)
+function _(e) {
+  if (!p(e) || e.isActive !== !0)
     return;
-  const i = r.displayOrder;
-  if (typeof i != "number" || !Number.isFinite(i))
+  const r = e.displayOrder;
+  if (typeof r != "number" || !Number.isFinite(r))
     return;
-  const t = typeof r.validationValue == "string" ? r.validationValue : typeof r.validationValue == "number" ? String(r.validationValue) : void 0;
-  return S({
-    id: typeof r.id == "string" ? r.id : "",
+  const o = typeof e.validationValue == "string" ? e.validationValue : typeof e.validationValue == "number" ? String(e.validationValue) : void 0;
+  return F({
+    id: typeof e.id == "string" ? e.id : "",
     isActive: !0,
-    displayOrder: i,
-    validationType: g(r.validationType, t),
-    validationValue: t
+    displayOrder: r,
+    validationType: M(e.validationType, o),
+    validationValue: o
   });
 }
-function b(r, i) {
-  if (!V(r))
+function g(e, r) {
+  return e.nullable().defined(r).test(
+    "active-validation-value-present",
+    r,
+    (o) => o != null
+  );
+}
+function U(e, r) {
+  if (!A(e))
     return;
-  const t = v(r), n = Array.isArray(r.validations) ? r.validations : [];
-  if (n.length === 0 && !t)
+  const o = E(e), l = Array.isArray(e.validations) ? e.validations : [];
+  if (l.length === 0 && !o)
     return;
-  const s = p(r), d = n.map(F).filter((o) => o !== void 0).sort((o, a) => o.displayOrder - a.displayOrder);
-  let e = s;
-  for (const o of d) {
-    const a = o.validationType;
-    if (!a)
+  const a = v(e), u = l.map(_).filter((t) => t !== void 0).sort((t, n) => t.displayOrder - n.displayOrder);
+  let i = a, s = !1, d = r(c.IS_REQUIRED_MESSAGE);
+  for (const t of u) {
+    const n = t.validationType;
+    if (!n)
       continue;
-    const m = y[a.id];
-    m !== void 0 ? e = m.apply({
-      field: r,
-      getLabel: i,
-      baseSchema: s,
-      schema: e,
-      validation: o
-    }) : console.warn(`Unsupported validation type: ${a.id}`);
+    const f = S[n.id];
+    if (f !== void 0) {
+      const m = f.apply({
+        field: e,
+        getLabel: r,
+        baseSchema: a,
+        schema: i,
+        validation: t
+      });
+      n.id !== "fvl_required" && m !== i && (s || (d = I(
+        t,
+        r,
+        d
+      )), s = !0), i = m;
+    } else
+      console.warn(`Unsupported validation type: ${n.id}`);
   }
-  const c = d.some((o) => o.validationType?.id === "fvl_required");
-  return t && !c && (e = A(
-    r,
+  const V = u.some((t) => t.validationType?.id === "fvl_required");
+  return o && !V && (i = R(
     e,
-    s,
-    i(l.IS_REQUIRED_MESSAGE)
-  )), t || (s instanceof f.ArraySchema ? e = e.default([]) : e = e.nullable()), e;
+    i,
+    a,
+    r(c.IS_REQUIRED_MESSAGE)
+  )), o || (a instanceof y.ArraySchema ? i = i.default([]) : s ? i = g(
+    i,
+    d
+  ) : i = i.nullable()), i;
 }
 export {
-  b as createFieldValidationSchema
+  U as createFieldValidationSchema
 };

package/components/DynamicForm/helpers/createFieldValidationSchema/strategies/validation/validationStrategies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validationStrategies.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/components/src/components/DynamicForm/helpers/createFieldValidationSchema/strategies/validation/validationStrategies.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAIlD,oGAAoG;AACpG,eAAO,MAAM,0BAA0B,EAAE,kBAwBxC,CAAC;AAEF,2BAA2B;AAC3B,eAAO,MAAM,2BAA2B,EAAE,kBAyBzC,CAAC;AAEF,2BAA2B;AAC3B,eAAO,MAAM,2BAA2B,EAAE,kBAyBzC,CAAC;AAEF,0BAA0B;AAC1B,eAAO,MAAM,qBAAqB,EAAE,kBAyBnC,CAAC;AAEF,0BAA0B;AAC1B,eAAO,MAAM,qBAAqB,EAAE,kBAyBnC,CAAC;AAEF,6BAA6B;AAC7B,eAAO,MAAM,uBAAuB,EAAE,kBAmBrC,CAAC;AAEF,2BAA2B;AAC3B,eAAO,MAAM,qBAAqB,EAAE,kBAmBnC,CAAC;AAEF,8BAA8B;AAC9B,eAAO,MAAM,yBAAyB,EAAE,kBA4BvC,CAAC;AAEF,iEAAiE;AACjE,eAAO,MAAM,wBAAwB,EAAE,kBAoEtC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,4BAA4B,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAU3E,CAAC"}
+{"version":3,"file":"validationStrategies.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/components/src/components/DynamicForm/helpers/createFieldValidationSchema/strategies/validation/validationStrategies.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAkBlD,oGAAoG;AACpG,eAAO,MAAM,0BAA0B,EAAE,kBAwBxC,CAAC;AAEF,2BAA2B;AAC3B,eAAO,MAAM,2BAA2B,EAAE,kBAyBzC,CAAC;AAEF,2BAA2B;AAC3B,eAAO,MAAM,2BAA2B,EAAE,kBAyBzC,CAAC;AAEF,0BAA0B;AAC1B,eAAO,MAAM,qBAAqB,EAAE,kBAyBnC,CAAC;AAEF,0BAA0B;AAC1B,eAAO,MAAM,qBAAqB,EAAE,kBAyBnC,CAAC;AAEF,6BAA6B;AAC7B,eAAO,MAAM,uBAAuB,EAAE,kBAmBrC,CAAC;AAEF,2BAA2B;AAC3B,eAAO,MAAM,qBAAqB,EAAE,kBAmBnC,CAAC;AAEF,8BAA8B;AAC9B,eAAO,MAAM,yBAAyB,EAAE,kBA4BvC,CAAC;AAEF,iEAAiE;AACjE,eAAO,MAAM,wBAAwB,EAAE,kBAkEtC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,4BAA4B,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAU3E,CAAC"}