@ciwergrp/nuxid 1.7.2 → 1.8.0

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@ciwergrp/nuxid",
   "configKey": "nuxid",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/validator.js

@@ -1,6 +1,6 @@
-const createSameAsValidator = (otherField, formState, message) => {
+const createSameAsValidator = (otherField, getFormState, message) => {
   return (_rule, value, callback) => {
-    const otherValue = getNestedValue(formState, otherField);
+    const otherValue = getNestedValue(getFormState(), otherField);
     if (value !== otherValue) {
       callback(new Error(message));
     } else {
@@ -206,9 +206,9 @@ const createIntegerValidator = (message) => {
     }
   };
 };
-const createComparisonValidator = (otherField, formState, message, compare) => {
+const createComparisonValidator = (otherField, getFormState, message, compare) => {
   return (_rule, value, callback) => {
-    const otherValue = getNestedValue(formState, otherField);
+    const otherValue = getNestedValue(getFormState(), otherField);
     if (value && otherValue && !compare(value, otherValue)) {
       callback(new Error(message));
     } else {
@@ -331,10 +331,14 @@ export const createValidationRules = (definitions, formState, options = {}) => {
   if (authorize && !authorize()) {
     throw new Error("This action is unauthorized.");
   }
-  let dataToValidate = { ...formState };
-  if (prepareForValidation) {
-    dataToValidate = prepareForValidation(dataToValidate);
-  }
+  const getValidationData = () => {
+    const nextData = { ...formState };
+    if (prepareForValidation) {
+      return prepareForValidation(nextData);
+    }
+    return nextData;
+  };
+  const dataToValidate = getValidationData();
   const rules = {};
   const getMessage = (fieldName, rule, defaultMessage) => {
     const customMessageKey = `${fieldName}.${rule}`;
@@ -397,7 +401,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           const expectedValues = paramValues.slice(1);
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              const otherValue = getNestedValue(dataToValidate, otherField);
+              const otherValue = getNestedValue(getValidationData(), otherField);
               const shouldRequire = expectedValues.some((expected) => normalizeComparisonValue(otherValue, expected));
               if (!shouldRequire) {
                 return callback();
@@ -428,7 +432,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
         case "filled":
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              if (!hasNestedKey(dataToValidate, fieldName)) {
+              if (!hasNestedKey(getValidationData(), fieldName)) {
                 return callback();
               }
               if (!isFilledValue(value)) {
@@ -442,7 +446,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
         case "present":
           fieldRules.push({
             validator: (_rule, _value, callback) => {
-              if (!hasNestedKey(dataToValidate, fieldName)) {
+              if (!hasNestedKey(getValidationData(), fieldName)) {
                 return callback(new Error(getMessage(fieldName, "present", `${attributeName} must be present`)));
               }
               callback();
@@ -458,7 +462,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           const expectedValues = paramValues.slice(1);
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              const otherValue = getNestedValue(dataToValidate, otherField);
+              const otherValue = getNestedValue(getValidationData(), otherField);
               const shouldRequire = expectedValues.some((expected) => normalizeComparisonValue(otherValue, expected));
               if (!shouldRequire) {
                 return callback();
@@ -480,7 +484,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           const expectedValues = paramValues.slice(1);
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              const otherValue = getNestedValue(dataToValidate, otherField);
+              const otherValue = getNestedValue(getValidationData(), otherField);
               const isExcluded = expectedValues.some((expected) => normalizeComparisonValue(otherValue, expected));
               if (isExcluded) {
                 return callback();
@@ -501,7 +505,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           const otherFields = paramValues;
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              if (!hasAnyFilled(dataToValidate, otherFields)) {
+              if (!hasAnyFilled(getValidationData(), otherFields)) {
                 return callback();
               }
               if (!isFilledValue(value)) {
@@ -520,7 +524,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           const otherFields = paramValues;
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              if (!hasAllFilled(dataToValidate, otherFields)) {
+              if (!hasAllFilled(getValidationData(), otherFields)) {
                 return callback();
               }
               if (!isFilledValue(value)) {
@@ -539,7 +543,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           const otherFields = paramValues;
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              if (hasAnyFilled(dataToValidate, otherFields)) {
+              if (hasAnyFilled(getValidationData(), otherFields)) {
                 return callback();
               }
               if (!isFilledValue(value)) {
@@ -558,7 +562,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           const otherFields = paramValues;
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              if (hasAllFilled(dataToValidate, otherFields)) {
+              if (hasAllFilled(getValidationData(), otherFields)) {
                 return callback();
               }
               if (!isFilledValue(value)) {
@@ -589,7 +593,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           const expectedValues = paramValues.slice(1);
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              const otherValue = getNestedValue(dataToValidate, otherField);
+              const otherValue = getNestedValue(getValidationData(), otherField);
               const shouldProhibit = expectedValues.some((expected) => normalizeComparisonValue(otherValue, expected));
               if (!shouldProhibit) {
                 return callback();
@@ -611,7 +615,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           const expectedValues = paramValues.slice(1);
           fieldRules.push({
             validator: (_rule, value, callback) => {
-              const otherValue = getNestedValue(dataToValidate, otherField);
+              const otherValue = getNestedValue(getValidationData(), otherField);
               const isAllowed = expectedValues.some((expected) => normalizeComparisonValue(otherValue, expected));
               if (isAllowed) {
                 return callback();
@@ -635,7 +639,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
               if (!isFilledValue(value)) {
                 return callback();
               }
-              const hasAny = otherFields.some((field) => isFilledValue(getNestedValue(dataToValidate, field)));
+              const hasAny = otherFields.some((field) => isFilledValue(getNestedValue(getValidationData(), field)));
               if (hasAny) {
                 return callback(new Error(getMessage(fieldName, "prohibits", `${attributeName} prohibits ${otherFields.join(", ")}`)));
               }
@@ -749,7 +753,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const sameOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createSameAsValidator(firstParam, dataToValidate, getMessage(fieldName, "same", `${attributeName} must match ${sameOtherAttr}`)),
+            validator: createSameAsValidator(firstParam, getValidationData, getMessage(fieldName, "same", `${attributeName} must match ${sameOtherAttr}`)),
             trigger: pickTrigger(fieldName, "blur")
           });
           break;
@@ -760,7 +764,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const diffOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "different", `${attributeName} must be different from ${diffOtherAttr}`), (a, b) => a !== b),
+            validator: createComparisonValidator(firstParam, getValidationData, getMessage(fieldName, "different", `${attributeName} must be different from ${diffOtherAttr}`), (a, b) => a !== b),
             trigger: pickTrigger(fieldName, "blur")
           });
           break;
@@ -896,7 +900,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
               if (isEmptyValue(value)) {
                 return callback();
               }
-              const haystack = getNestedValue(dataToValidate, otherField);
+              const haystack = getNestedValue(getValidationData(), otherField);
               if (!Array.isArray(haystack)) {
                 return callback(new Error(getMessage(fieldName, "in_array", `${attributeName} must be one of the values in ${otherField}`)));
               }
@@ -1153,7 +1157,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
               if (isEmptyValue(value)) {
                 return callback();
               }
-              const confirmationValue = getNestedValue(dataToValidate, confirmationField);
+              const confirmationValue = getNestedValue(getValidationData(), confirmationField);
               if (value !== confirmationValue) {
                 return callback(new Error(getMessage(fieldName, "confirmed", `${attributeName} confirmation does not match`)));
               }
@@ -1210,7 +1214,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const gtOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "gt", `${attributeName} must be greater than ${gtOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x > y)),
+            validator: createComparisonValidator(firstParam, getValidationData, getMessage(fieldName, "gt", `${attributeName} must be greater than ${gtOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x > y)),
             trigger: pickTrigger(fieldName, "blur")
           });
           break;
@@ -1221,7 +1225,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const gteOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "gte", `${attributeName} must be greater than or equal to ${gteOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x >= y)),
+            validator: createComparisonValidator(firstParam, getValidationData, getMessage(fieldName, "gte", `${attributeName} must be greater than or equal to ${gteOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x >= y)),
             trigger: "blur"
           });
           break;
@@ -1232,7 +1236,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const ltOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "lt", `${attributeName} must be less than ${ltOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x < y)),
+            validator: createComparisonValidator(firstParam, getValidationData, getMessage(fieldName, "lt", `${attributeName} must be less than ${ltOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x < y)),
             trigger: "blur"
           });
           break;
@@ -1243,7 +1247,7 @@ export const createValidationRules = (definitions, formState, options = {}) => {
           }
           const lteOtherAttr = attributes[firstParam] || firstParam;
           fieldRules.push({
-            validator: createComparisonValidator(firstParam, dataToValidate, getMessage(fieldName, "lte", `${attributeName} must be less than or equal to ${lteOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x <= y)),
+            validator: createComparisonValidator(firstParam, getValidationData, getMessage(fieldName, "lte", `${attributeName} must be less than or equal to ${lteOtherAttr}`), (a, b) => compareFieldValues(a, b, (x, y) => x <= y)),
             trigger: "blur"
           });
           break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ciwergrp/nuxid",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "description": "All-in-one essential modules for Nuxt",
   "repository": {
     "type": "git",