@aemforms/af-core 0.22.164 → 0.22.165

package/esm/afb-runtime.js

@@ -57,7 +57,7 @@ const defaultConstraintTypeMessages = Object.freeze({
     [ConstraintType.RANGE_UNDERFLOW]: 'Value must be greater than or equal to ${0}.',
     [ConstraintType.TYPE_MISMATCH]: 'Please enter a valid value.',
     [ConstraintType.VALUE_MISSING]: 'Please fill in this field.',
-    [ConstraintType.STEP_MISMATCH]: 'Please enter a valid value.',
+    [ConstraintType.STEP_MISMATCH]: 'Please enter a valid value. The two nearest valid values are ${0} and ${1}.',
     [ConstraintType.FORMAT_MISMATCH]: 'Specify the value in allowed format : ${0}.',
     [ConstraintType.ACCEPT_MISMATCH]: 'The specified file type not supported.',
     [ConstraintType.FILE_SIZE_MISMATCH]: 'File too large. Reduce size and try again.',
@@ -2543,6 +2543,9 @@ class Container extends Scriptable {
             x.reset();
         });
     }
+    get valid() {
+        return this.items.every((item) => item.valid);
+    }
     validate() {
         return this.items.flatMap(x => {
             return x.validate();
@@ -2679,6 +2682,9 @@ __decorate([
 __decorate([
     dependencyTracked()
 ], Container.prototype, "minItems", null);
+__decorate([
+    dependencyTracked()
+], Container.prototype, "valid", null);
 __decorate([
     dependencyTracked()
 ], Container.prototype, "activeChild", null);
@@ -4967,10 +4973,32 @@ class Field extends Scriptable {
         const afConstraintKey = constraint;
         const html5ConstraintType = constraintKeys[afConstraintKey];
         const constraintTypeMessages = getConstraintTypeMessages();
-        return this._jsonModel.constraintMessages?.[afConstraintKey === 'exclusiveMaximum' ? 'maximum' :
+        const customMessage = this._jsonModel.constraintMessages?.[afConstraintKey === 'exclusiveMaximum' ? 'maximum' :
             afConstraintKey === 'exclusiveMinimum' ? 'minimum' :
-                afConstraintKey]
-            || replaceTemplatePlaceholders(constraintTypeMessages[html5ConstraintType], [this._jsonModel[afConstraintKey]]);
+                afConstraintKey];
+        if (customMessage) {
+            const stepValues = constraint === 'step' ? this._getStepMessageValues() : [this._jsonModel[afConstraintKey]];
+            return replaceTemplatePlaceholders(customMessage, stepValues.length === 2 ? stepValues : [this._jsonModel.step]);
+        }
+        if (constraint === 'step') {
+            const stepValues = this._getStepMessageValues();
+            if (stepValues.length === 2) {
+                return replaceTemplatePlaceholders(constraintTypeMessages[html5ConstraintType], stepValues);
+            }
+            return 'Please enter a valid value.';
+        }
+        return replaceTemplatePlaceholders(constraintTypeMessages[html5ConstraintType], [this._jsonModel[afConstraintKey]]);
+    }
+    _getStepMessageValues() {
+        const result = this.checkStep();
+        if (!result.valid
+            && result.prev != null
+            && result.next != null
+            && Number.isFinite(result.prev)
+            && Number.isFinite(result.next)) {
+            return [result.prev, result.next];
+        }
+        return [];
     }
     get errorMessage() {
         return this._jsonModel.errorMessage;
@@ -5030,7 +5058,7 @@ class Field extends Scriptable {
             let next, prev;
             if (!valid) {
                 next = (Math.ceil(qt) * fStep + fIVal) / factor;
-                prev = (next - fStep) / factor;
+                prev = next - step;
             }
             return {
                 valid,
@@ -5181,7 +5209,7 @@ class Field extends Scriptable {
             else {
                 valid = this.checkEnum(value, Constraints);
                 constraint = 'enum';
-                if (valid && this.type === 'number') {
+                if (valid && (this.type === 'number' || this.type === 'integer')) {
                     valid = this.checkStep().valid;
                     constraint = 'step';
                 }

package/esm/types/src/Container.d.ts

@@ -179,6 +179,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
     removeItem(action: Action): void;
     queueEvent(action: Action): void;
     reset(): void;
+    get valid(): boolean;
     validate(): import("./types/Model").ValidationError[];
     dispatch(action: Action): void;
     importData(dataModel: any): void;

package/esm/types/src/Field.d.ts

@@ -65,6 +65,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     valueOf(): any;
     toString(): any;
     getErrorMessage(constraint: keyof (ConstraintsMessages)): string;
+    private _getStepMessageValues;
     get errorMessage(): string | undefined;
     set errorMessage(e: string | undefined);
     set constraintMessage(constraint: {

package/esm/types/src/types/Json.d.ts

@@ -179,7 +179,7 @@ export declare const getConstraintTypeMessages: () => {
     rangeUnderflow: "Value must be greater than or equal to ${0}.";
     typeMismatch: "Please enter a valid value.";
     valueMissing: "Please fill in this field.";
-    stepMismatch: "Please enter a valid value.";
+    stepMismatch: "Please enter a valid value. The two nearest valid values are ${0} and ${1}.";
     formatMismatch: "Specify the value in allowed format : ${0}.";
     acceptMismatch: "The specified file type not supported.";
     fileSizeMismatch: "File too large. Reduce size and try again.";

package/lib/Container.d.ts

@@ -179,6 +179,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
     removeItem(action: Action): void;
     queueEvent(action: Action): void;
     reset(): void;
+    get valid(): boolean;
     validate(): import("./types/Model").ValidationError[];
     dispatch(action: Action): void;
     importData(dataModel: any): void;

package/lib/Container.js

@@ -347,6 +347,9 @@ class Container extends Scriptable_1.default {
             x.reset();
         });
     }
+    get valid() {
+        return this.items.every((item) => item.valid);
+    }
     validate() {
         return this.items.flatMap(x => {
             return x.validate();
@@ -487,6 +490,9 @@ __decorate([
 __decorate([
     (0, BaseNode_1.dependencyTracked)()
 ], Container.prototype, "minItems", null);
+__decorate([
+    (0, BaseNode_1.dependencyTracked)()
+], Container.prototype, "valid", null);
 __decorate([
     (0, BaseNode_1.dependencyTracked)()
 ], Container.prototype, "activeChild", null);

package/lib/Field.d.ts

@@ -65,6 +65,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     valueOf(): any;
     toString(): any;
     getErrorMessage(constraint: keyof (ConstraintsMessages)): string;
+    private _getStepMessageValues;
     get errorMessage(): string | undefined;
     set errorMessage(e: string | undefined);
     set constraintMessage(constraint: {

package/lib/Field.js

@@ -478,10 +478,32 @@ class Field extends Scriptable_1.default {
         const afConstraintKey = constraint;
         const html5ConstraintType = types_1.constraintKeys[afConstraintKey];
         const constraintTypeMessages = (0, types_1.getConstraintTypeMessages)();
-        return ((_a = this._jsonModel.constraintMessages) === null || _a === void 0 ? void 0 : _a[afConstraintKey === 'exclusiveMaximum' ? 'maximum' :
+        const customMessage = (_a = this._jsonModel.constraintMessages) === null || _a === void 0 ? void 0 : _a[afConstraintKey === 'exclusiveMaximum' ? 'maximum' :
             afConstraintKey === 'exclusiveMinimum' ? 'minimum' :
-                afConstraintKey])
-            || (0, FormUtils_1.replaceTemplatePlaceholders)(constraintTypeMessages[html5ConstraintType], [this._jsonModel[afConstraintKey]]);
+                afConstraintKey];
+        if (customMessage) {
+            const stepValues = constraint === 'step' ? this._getStepMessageValues() : [this._jsonModel[afConstraintKey]];
+            return (0, FormUtils_1.replaceTemplatePlaceholders)(customMessage, stepValues.length === 2 ? stepValues : [this._jsonModel.step]);
+        }
+        if (constraint === 'step') {
+            const stepValues = this._getStepMessageValues();
+            if (stepValues.length === 2) {
+                return (0, FormUtils_1.replaceTemplatePlaceholders)(constraintTypeMessages[html5ConstraintType], stepValues);
+            }
+            return 'Please enter a valid value.';
+        }
+        return (0, FormUtils_1.replaceTemplatePlaceholders)(constraintTypeMessages[html5ConstraintType], [this._jsonModel[afConstraintKey]]);
+    }
+    _getStepMessageValues() {
+        const result = this.checkStep();
+        if (!result.valid
+            && result.prev != null
+            && result.next != null
+            && Number.isFinite(result.prev)
+            && Number.isFinite(result.next)) {
+            return [result.prev, result.next];
+        }
+        return [];
     }
     get errorMessage() {
         return this._jsonModel.errorMessage;
@@ -537,7 +559,7 @@ class Field extends Scriptable_1.default {
             let next, prev;
             if (!valid) {
                 next = (Math.ceil(qt) * fStep + fIVal) / factor;
-                prev = (next - fStep) / factor;
+                prev = next - step;
             }
             return {
                 valid,
@@ -688,7 +710,7 @@ class Field extends Scriptable_1.default {
             else {
                 valid = this.checkEnum(value, Constraints);
                 constraint = 'enum';
-                if (valid && this.type === 'number') {
+                if (valid && (this.type === 'number' || this.type === 'integer')) {
                     valid = this.checkStep().valid;
                     constraint = 'step';
                 }

package/lib/types/Json.d.ts

@@ -179,7 +179,7 @@ export declare const getConstraintTypeMessages: () => {
     rangeUnderflow: "Value must be greater than or equal to ${0}.";
     typeMismatch: "Please enter a valid value.";
     valueMissing: "Please fill in this field.";
-    stepMismatch: "Please enter a valid value.";
+    stepMismatch: "Please enter a valid value. The two nearest valid values are ${0} and ${1}.";
     formatMismatch: "Specify the value in allowed format : ${0}.";
     acceptMismatch: "The specified file type not supported.";
     fileSizeMismatch: "File too large. Reduce size and try again.";

package/lib/types/Json.js

@@ -56,7 +56,7 @@ const defaultConstraintTypeMessages = Object.freeze({
     [exports.ConstraintType.RANGE_UNDERFLOW]: 'Value must be greater than or equal to ${0}.',
     [exports.ConstraintType.TYPE_MISMATCH]: 'Please enter a valid value.',
     [exports.ConstraintType.VALUE_MISSING]: 'Please fill in this field.',
-    [exports.ConstraintType.STEP_MISMATCH]: 'Please enter a valid value.',
+    [exports.ConstraintType.STEP_MISMATCH]: 'Please enter a valid value. The two nearest valid values are ${0} and ${1}.',
     [exports.ConstraintType.FORMAT_MISMATCH]: 'Specify the value in allowed format : ${0}.',
     [exports.ConstraintType.ACCEPT_MISMATCH]: 'The specified file type not supported.',
     [exports.ConstraintType.FILE_SIZE_MISMATCH]: 'File too large. Reduce size and try again.',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.164",
+  "version": "0.22.165",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.164"
+    "@aemforms/af-formatters": "^0.22.165"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",