@researchdatabox/sails-ng-common 0.0.1-beta.9604 → 0.0.1-beta.9873

package/dist/src/validation/validators.js

@@ -2,6 +2,42 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formValidatorsSharedDefinitions = exports.FORM_VALIDATOR_EMAIL_REGEXP = void 0;
 const helpers_1 = require("./helpers");
+function hasMeaningfulValue(value) {
+    if (value == null) {
+        return false;
+    }
+    if (typeof value === "string") {
+        return value.trim().length > 0;
+    }
+    const lengthOrSize = (0, helpers_1.formValidatorLengthOrSize)(value);
+    if (lengthOrSize !== null) {
+        return lengthOrSize > 0;
+    }
+    return true;
+}
+function hasLegacyRequiredValue(value) {
+    if (value == null) {
+        return false;
+    }
+    const lengthOrSize = (0, helpers_1.formValidatorLengthOrSize)(value);
+    if (lengthOrSize !== null) {
+        return lengthOrSize > 0;
+    }
+    return true;
+}
+function hasRequiredFieldValue(value, fieldNames) {
+    if (fieldNames.length === 0) {
+        return hasLegacyRequiredValue(value);
+    }
+    if (Array.isArray(value)) {
+        return value.some(item => hasRequiredFieldValue(item, fieldNames));
+    }
+    if (value == null || typeof value !== "object") {
+        return false;
+    }
+    const candidate = value;
+    return fieldNames.some(fieldName => hasMeaningfulValue(candidate[fieldName]));
+}
 /**
  * A regular expression for validating an email address.
  *
@@ -26,10 +62,6 @@ exports.formValidatorsSharedDefinitions = [
         class: "min",
         message: "@validator-error-min",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "min");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-min");
             const optionMinKey = "min";
             const optionMinValue = (0, helpers_1.formValidatorGetDefinitionNumber)(config, optionMinKey);
             return (control) => {
@@ -46,15 +78,10 @@ exports.formValidatorsSharedDefinitions = [
                 // Controls with NaN values after parsing should be treated as not having a
                 // minimum, per the HTML forms spec: https://www.w3.org/TR/html5/forms.html#attr-input-min
                 if (value === undefined || (!isNaN(value) && value < optionMinValue)) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                requiredThreshold: optionMinValue,
-                                actual: control.value,
-                            },
-                        },
-                    };
+                    return (0, helpers_1.formValidatorBuildError)(config, {
+                        requiredThreshold: optionMinValue,
+                        actual: control.value,
+                    });
                 }
                 return null;
             };
@@ -64,10 +91,6 @@ exports.formValidatorsSharedDefinitions = [
         class: "max",
         message: "@validator-error-max",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "max");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-max");
             const optionMaxKey = "max";
             const optionMaxValue = (0, helpers_1.formValidatorGetDefinitionNumber)(config, optionMaxKey);
             return (control) => {
@@ -84,15 +107,10 @@ exports.formValidatorsSharedDefinitions = [
                 // Controls with NaN values after parsing should be treated as not having a
                 // maximum, per the HTML forms spec: https://www.w3.org/TR/html5/forms.html#attr-input-max
                 if (value === undefined || (!isNaN(value) && value > optionMaxValue)) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                requiredThreshold: optionMaxValue,
-                                actual: control.value,
-                            },
-                        },
-                    };
+                    return (0, helpers_1.formValidatorBuildError)(config, {
+                        requiredThreshold: optionMaxValue,
+                        actual: control.value,
+                    });
                 }
                 return null;
             };
@@ -102,10 +120,6 @@ exports.formValidatorsSharedDefinitions = [
         class: "minLength",
         message: "@validator-error-min-length",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "minLength");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-min-length");
             const optionMinLengthKey = "minLength";
             const optionMinLengthValue = (0, helpers_1.formValidatorGetDefinitionNumber)(config, optionMinLengthKey);
             return (control) => {
@@ -116,15 +130,10 @@ exports.formValidatorsSharedDefinitions = [
                     return null;
                 }
                 return length < optionMinLengthValue
-                    ? {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                requiredLength: optionMinLengthValue,
-                                actualLength: length,
-                            },
-                        },
-                    }
+                    ? (0, helpers_1.formValidatorBuildError)(config, {
+                        requiredLength: optionMinLengthValue,
+                        actualLength: length,
+                    })
                     : null;
             };
         },
@@ -133,24 +142,15 @@ exports.formValidatorsSharedDefinitions = [
         class: "maxLength",
         message: "@validator-error-max-length",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "maxLength");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-max-length");
             const optionMaxLengthKey = "maxLength";
             const optionMaxLengthValue = (0, helpers_1.formValidatorGetDefinitionNumber)(config, optionMaxLengthKey);
             return (control) => {
                 const length = (0, helpers_1.formValidatorLengthOrSize)(control.value);
                 if (length !== null && length > optionMaxLengthValue) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                requiredLength: optionMaxLengthValue,
-                                actualLength: length,
-                            },
-                        },
-                    };
+                    return (0, helpers_1.formValidatorBuildError)(config, {
+                        requiredLength: optionMaxLengthValue,
+                        actualLength: length,
+                    });
                 }
                 return null;
             };
@@ -160,23 +160,23 @@ exports.formValidatorsSharedDefinitions = [
         class: "required",
         message: "@validator-error-required",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "required");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-required");
             const optionRequiredKey = "required";
             const optionRequiredValue = (0, helpers_1.formValidatorGetDefinitionBoolean)(config, optionRequiredKey, true);
+            const optionAnyOfFields = Array.isArray(config?.['anyOfFields'])
+                ? config['anyOfFields'].map(item => item?.toString() ?? "").filter(item => item.length > 0)
+                : [];
             return (control) => {
-                if (optionRequiredValue && (control.value == null || (0, helpers_1.formValidatorLengthOrSize)(control.value) === 0)) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                required: optionRequiredValue,
-                                actual: control.value,
-                            },
-                        },
-                    };
+                if (!optionRequiredValue) {
+                    return null;
+                }
+                const isValid = optionAnyOfFields.length > 0
+                    ? hasRequiredFieldValue(control.value, optionAnyOfFields)
+                    : control.value != null && (0, helpers_1.formValidatorLengthOrSize)(control.value) !== 0;
+                if (!isValid) {
+                    return (0, helpers_1.formValidatorBuildError)(config, {
+                        required: optionRequiredValue,
+                        actual: control.value,
+                    });
                 }
                 return null;
             };
@@ -186,23 +186,14 @@ exports.formValidatorsSharedDefinitions = [
         class: "requiredTrue",
         message: "@validator-error-required-true",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "requiredTrue")?.toString() ?? "";
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-required-true");
             const optionRequiredKey = "requiredTrue";
             const optionRequiredValue = (0, helpers_1.formValidatorGetDefinitionBoolean)(config, optionRequiredKey, true);
             return (control) => {
                 if (optionRequiredValue && control.value !== true) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                required: optionRequiredValue,
-                                actual: control.value,
-                            },
-                        },
-                    };
+                    return (0, helpers_1.formValidatorBuildError)(config, {
+                        required: optionRequiredValue,
+                        actual: control.value,
+                    });
                 }
                 return null;
             };
@@ -212,10 +203,6 @@ exports.formValidatorsSharedDefinitions = [
         class: "email",
         message: "@validator-error-email",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "email");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-email");
             const optionDescriptionKey = "description";
             const optionDescriptionValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionDescriptionKey, "email must be in format (name)@(domain.tld)");
             const optionPatternKey = "pattern";
@@ -228,15 +215,10 @@ exports.formValidatorsSharedDefinitions = [
                 const value = control.value?.toString() ?? "";
                 const testOutcome = optionPatternValue.test(value);
                 if (!testOutcome) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                requiredPattern: optionPatternValue,
-                                description: optionDescriptionValue, actual: control.value,
-                            },
-                        },
-                    };
+                    return (0, helpers_1.formValidatorBuildError)(config, {
+                        requiredPattern: optionPatternValue,
+                        description: optionDescriptionValue, actual: control.value,
+                    });
                 }
                 return null;
             };
@@ -246,10 +228,6 @@ exports.formValidatorsSharedDefinitions = [
         class: "pattern",
         message: "@validator-error-pattern",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "pattern");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-pattern");
             const optionDescriptionKey = "description";
             const optionDescriptionValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionDescriptionKey);
             const optionPatternKey = "pattern";
@@ -272,16 +250,11 @@ exports.formValidatorsSharedDefinitions = [
                 const value = control.value?.toString();
                 return regex.test(value)
                     ? null
-                    : {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                requiredPattern: regexStr,
-                                description: optionDescriptionValue,
-                                actual: value,
-                            },
-                        },
-                    };
+                    : (0, helpers_1.formValidatorBuildError)(config, {
+                        requiredPattern: regexStr,
+                        description: optionDescriptionValue,
+                        actual: value,
+                    });
             };
         },
     },
@@ -289,10 +262,6 @@ exports.formValidatorsSharedDefinitions = [
         class: "different-values",
         message: "@validator-error-different-values",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "different-values");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-different-values");
             const optionControlNamesKey = "controlNames";
             const optionControlNamesValue = (0, helpers_1.formValidatorGetDefinitionArray)(config, optionControlNamesKey);
             return (control) => {
@@ -301,20 +270,15 @@ exports.formValidatorsSharedDefinitions = [
                     ?.filter(i => i !== null && i !== undefined)
                     ?.map(n => control?.get(n?.toString())) ?? [];
                 const values = new Set(controls?.map(c => c?.value) ?? []);
-                if (values.size !== controls.length) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                controlNames: optionControlNamesValue,
-                                controlCount: optionControlNamesValue?.length,
-                                valueCount: values.size,
-                                values: Array.from(values),
-                            },
-                        },
-                    };
-                }
-                return null;
+                const compare = values.size === controls.length;
+                return compare
+                    ? null
+                    : (0, helpers_1.formValidatorBuildError)(config, {
+                        controlNames: optionControlNamesValue,
+                        controlCount: optionControlNamesValue?.length,
+                        valueCount: values.size,
+                        values: Array.from(values),
+                    });
             };
         },
     },
@@ -322,10 +286,6 @@ exports.formValidatorsSharedDefinitions = [
         class: "jsonata-expression",
         message: "@validator-error-jsonata-expression",
         createAsync: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "jsonata-expression");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-jsonata-expression");
             const optionDescriptionKey = "description";
             const optionDescriptionValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionDescriptionKey, "");
             const optionExpressionKey = "expression";
@@ -364,16 +324,11 @@ exports.formValidatorsSharedDefinitions = [
                 }
                 return success
                     ? null
-                    : {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                expression: expression,
-                                description: optionDescriptionValue,
-                                actual: value,
-                            },
-                        },
-                    };
+                    : (0, helpers_1.formValidatorBuildError)(config, {
+                        expression: expression,
+                        description: optionDescriptionValue,
+                        actual: control.value,
+                    });
             };
         },
     },
@@ -382,10 +337,6 @@ exports.formValidatorsSharedDefinitions = [
         class: "orcid",
         message: "@validator-error-orcid",
         create: (config) => {
-            const optionNameKey = "class";
-            const optionNameValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionNameKey, "orcid");
-            const optionMessageKey = "message";
-            const optionMessageValue = (0, helpers_1.formValidatorGetDefinitionString)(config, optionMessageKey, "@validator-error-orcid");
             return (control) => {
                 if (control.value == null || control.value === "") {
                     return null; // don't validate empty values
@@ -393,25 +344,15 @@ exports.formValidatorsSharedDefinitions = [
                 let value = control.value.toString();
                 // Validate format: either xxxx-xxxx-xxxx-xxxx or xxxxxxxxxxxxxxxx, last digit can be X or x
                 if (!/^(\d{4}-\d{4}-\d{4}-\d{3}[\dXx]|\d{15}[\dXx])$/.test(value)) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                actual: control.value,
-                            },
-                        },
-                    };
+                    return (0, helpers_1.formValidatorBuildError)(config, {
+                        actual: control.value,
+                    });
                 }
                 value = value.replace(/-/g, '');
                 if (value.length !== 16) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                actual: control.value,
-                            },
-                        },
-                    };
+                    return (0, helpers_1.formValidatorBuildError)(config, {
+                        actual: control.value,
+                    });
                 }
                 const baseDigits = value.substring(0, 15);
                 const checkDigit = value.substring(15);
@@ -424,18 +365,13 @@ exports.formValidatorsSharedDefinitions = [
                 const result = (12 - remainder) % 11;
                 const calculatedCheckDigit = result === 10 ? "X" : result.toString();
                 if (checkDigit.toUpperCase() !== calculatedCheckDigit) {
-                    return {
-                        [optionNameValue]: {
-                            [optionMessageKey]: optionMessageValue,
-                            params: {
-                                actual: control.value,
-                            },
-                        },
-                    };
+                    return (0, helpers_1.formValidatorBuildError)(config, {
+                        actual: control.value,
+                    });
                 }
                 return null;
             };
         },
     },
 ];
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/validation/validators.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/validation/validators.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@researchdatabox/sails-ng-common",
-  "version": "0.0.1-beta.9604",
+  "version": "0.0.1-beta.9873",
   "description": "Common models shared between Sails API endpoints and client-side Angular code",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -44,14 +44,14 @@
     "@types/lodash-es": "4.17.12",
     "@types/luxon": "3.7.1",
     "@types/mocha": "10.0.10",
-    "@types/node": "24.12.0",
+    "@types/node": "24.12.4",
     "chai": "6.2.2",
-    "jsonata": "2.1.0",
-    "mocha": "11.7.5",
+    "jsonata": "2.2.1",
+    "mocha": "11.7.6",
     "mocha-junit-reporter": "2.2.1",
     "nyc": "18.0.0",
     "serialize-javascript": "7.0.5",
-    "typescript": "6.0.3"
+    "typescript": "5.9.3"
   },
   "nyc": {
     "check-coverage": true,
@@ -72,22 +72,22 @@
     ]
   },
   "dependencies": {
-    "@jsonjoy.com/json-pointer": "18.21.0",
+    "@jsonjoy.com/json-pointer": "18.24.0",
     "lodash": "4.18.1",
     "lodash-es": "4.18.1",
     "luxon": "3.7.2",
-    "marked": "18.0.3",
+    "marked": "18.0.4",
     "ts-json-schema-generator": "2.9.0"
   },
   "overrides": {
     "uuid": "14.0.0",
     "mocha": {
-      "minimatch": "9.0.7",
+      "minimatch": "10.2.5",
       "serialize-javascript": "7.0.5"
     }
   },
   "peerDependencies": {
-    "jsonata": "2.1.0"
+    "jsonata": "2.2.1"
   },
   "publishConfig": {
     "access": "public",