@aemforms/af-core 0.22.74 → 0.22.76

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

@@ -56,14 +56,16 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
         columnClassNames?: undefined;
         columnCount?: undefined;
         gridClassNames?: undefined;
+        ':type': string;
+        repeatable?: boolean | undefined;
+        minOccur?: number | undefined;
+        maxOccur?: number | undefined;
         properties: {
             [key: string]: any;
         };
         index: number;
         parent: undefined;
         qualifiedName: any;
-        repeatable: boolean | undefined;
-        ':type': string;
         id: string;
     };
     subscribe(callback: callbackFn, eventName?: string): {

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

@@ -130,7 +130,7 @@ declare class Checkbox extends Field {
         properties: {
             [key: string]: any;
         };
-        repeatable: boolean | undefined;
+        repeatable?: boolean | undefined;
         screenReaderText?: string | undefined;
         tooltip?: string | undefined;
         altText?: string | undefined;
@@ -141,6 +141,7 @@ declare class Checkbox extends Field {
         validationMessage?: string | undefined;
         default?: any;
         value?: any;
+        displayValueExpression?: string | undefined;
         emptyValue?: "" | "undefined" | "null" | undefined;
         _dependents?: string[] | undefined;
         allowedComponents?: undefined;

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

@@ -37,14 +37,16 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
         columnClassNames?: undefined;
         columnCount?: undefined;
         gridClassNames?: undefined;
+        ':type': string;
+        repeatable?: boolean | undefined;
+        minOccur?: number | undefined;
+        maxOccur?: number | undefined;
         properties: {
             [key: string]: any;
         };
         index: number;
         parent: undefined;
         qualifiedName: any;
-        repeatable: boolean | undefined;
-        ':type': string;
         id: string;
     };
     private _createChild;

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

@@ -28,6 +28,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     private coerceParam;
     get editFormat(): string | undefined;
     get displayFormat(): string | undefined;
+    get displayValueExpression(): string | undefined;
     get placeholder(): string | undefined;
     get readOnly(): boolean | undefined;
     set readOnly(e: boolean | undefined);
@@ -197,7 +198,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         properties: {
             [key: string]: any;
         };
-        repeatable: boolean | undefined;
+        repeatable?: boolean | undefined;
         screenReaderText?: string | undefined;
         tooltip?: string | undefined;
         altText?: string | undefined;
@@ -208,6 +209,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         validationMessage?: string | undefined;
         default?: any;
         value?: any;
+        displayValueExpression?: string | undefined;
         emptyValue?: "" | "undefined" | "null" | undefined;
         checked?: boolean | undefined;
         _dependents?: string[] | undefined;

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

@@ -91,14 +91,16 @@ declare class Form extends Container<FormJson> implements FormModel {
         columnClassNames?: undefined;
         columnCount?: undefined;
         gridClassNames?: undefined;
+        ':type': string;
+        repeatable?: boolean | undefined;
+        minOccur?: number | undefined;
+        maxOccur?: number | undefined;
         properties: {
             [key: string]: any;
         };
         index: number;
         parent: undefined;
         qualifiedName: any;
-        repeatable: boolean | undefined;
-        ':type': string;
         id: string;
     };
     get type(): string;

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

@@ -99,6 +99,7 @@ export type FieldJson = BaseJson & TranslationFieldJson & {
     editFormat?: string;
     editValue?: string;
     displayValue?: string;
+    displayValueExpression?: string;
     emptyValue?: 'null' | 'undefined' | '';
     checked?: boolean;
 };

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

@@ -78,6 +78,7 @@ export interface FieldModel extends BaseModel, ScriptableField, WithState<FieldJ
     readonly editFormat?: string;
     readonly displayFormat?: string;
     readonly displayValue?: string;
+    readonly displayValueExpression?: string;
     readonly editValue?: string;
 }
 export interface FormMetaDataModel {

package/esm/types/src/utils/ValidationUtils.d.ts

@@ -12,7 +12,8 @@ type ValidConstraintsType = {
     email: ValidationConstraints[];
 };
 export declare const ValidConstraints: ValidConstraintsType;
-export type ValidationConstraints = 'type' | 'format' | 'minimum' | 'maximum' | 'exclusiveMinimum' | 'exclusiveMaximum' | 'minItems' | 'maxItems' | 'uniqueItems' | 'minLength' | 'maxLength' | 'pattern' | 'required' | 'enum' | 'accept' | 'maxFileSize';
+export declare const validationConstraintsList: readonly ["type", "format", "minimum", "maximum", "exclusiveMinimum", "exclusiveMaximum", "minItems", "maxItems", "uniqueItems", "minLength", "maxLength", "pattern", "required", "enum", "accept", "maxFileSize"];
+export type ValidationConstraints = typeof validationConstraintsList[number];
 type ConstraintsObject = {
     [key in ValidationConstraints]: (constraint: any, inputVal: any) => ValidationResult;
 };

package/lib/BaseNode.d.ts

@@ -56,14 +56,16 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
         columnClassNames?: undefined;
         columnCount?: undefined;
         gridClassNames?: undefined;
+        ':type': string;
+        repeatable?: boolean | undefined;
+        minOccur?: number | undefined;
+        maxOccur?: number | undefined;
         properties: {
             [key: string]: any;
         };
         index: number;
         parent: undefined;
         qualifiedName: any;
-        repeatable: boolean | undefined;
-        ':type': string;
         id: string;
     };
     subscribe(callback: callbackFn, eventName?: string): {

package/lib/BaseNode.js

@@ -13,6 +13,7 @@ exports.BaseNode = exports.exclude = exports.include = exports.dependencyTracked
 const Events_1 = require("./controller/Events");
 const DataRefParser_1 = require("./utils/DataRefParser");
 const EmptyDataValue_1 = __importDefault(require("./data/EmptyDataValue"));
+const ValidationUtils_1 = require("./utils/ValidationUtils");
 exports.editableProperties = [
     'value',
     'label',
@@ -240,7 +241,11 @@ class BaseNode {
         return !this._jsonModel.name && !isNonTransparent;
     }
     getState(forRestore = false) {
-        return Object.assign(Object.assign(Object.assign({}, this._jsonModel), { properties: this.properties, index: this.index, parent: undefined, qualifiedName: this.qualifiedName, repeatable: this.repeatable === true ? true : undefined, ':type': this[':type'] }), (forRestore ? {
+        return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, this._jsonModel), { properties: this.properties, index: this.index, parent: undefined, qualifiedName: this.qualifiedName }), (this.repeatable === true ? {
+            repeatable: true,
+            minOccur: this.parent.minItems,
+            maxOccur: this.parent.maxItems
+        } : {})), { ':type': this[':type'] }), (forRestore ? {
             _dependents: this._dependents.length ? this._dependents.map(x => x.node.id) : undefined,
             allowedComponents: undefined,
             columnClassNames: undefined,
@@ -323,6 +328,9 @@ class BaseNode {
                 this.notifyDependents(changeAction);
             }
             notifyChildren.call(this, changeAction);
+            if (ValidationUtils_1.validationConstraintsList.includes(prop)) {
+                this.validate();
+            }
             return changeAction.payload.changes;
         }
         return [];

package/lib/Checkbox.d.ts

@@ -130,7 +130,7 @@ declare class Checkbox extends Field {
         properties: {
             [key: string]: any;
         };
-        repeatable: boolean | undefined;
+        repeatable?: boolean | undefined;
         screenReaderText?: string | undefined;
         tooltip?: string | undefined;
         altText?: string | undefined;
@@ -141,6 +141,7 @@ declare class Checkbox extends Field {
         validationMessage?: string | undefined;
         default?: any;
         value?: any;
+        displayValueExpression?: string | undefined;
         emptyValue?: "" | "undefined" | "null" | undefined;
         _dependents?: string[] | undefined;
         allowedComponents?: undefined;

package/lib/Container.d.ts

@@ -37,14 +37,16 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
         columnClassNames?: undefined;
         columnCount?: undefined;
         gridClassNames?: undefined;
+        ':type': string;
+        repeatable?: boolean | undefined;
+        minOccur?: number | undefined;
+        maxOccur?: number | undefined;
         properties: {
             [key: string]: any;
         };
         index: number;
         parent: undefined;
         qualifiedName: any;
-        repeatable: boolean | undefined;
-        ':type': string;
         id: string;
     };
     private _createChild;

package/lib/Field.d.ts

@@ -28,6 +28,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     private coerceParam;
     get editFormat(): string | undefined;
     get displayFormat(): string | undefined;
+    get displayValueExpression(): string | undefined;
     get placeholder(): string | undefined;
     get readOnly(): boolean | undefined;
     set readOnly(e: boolean | undefined);
@@ -197,7 +198,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         properties: {
             [key: string]: any;
         };
-        repeatable: boolean | undefined;
+        repeatable?: boolean | undefined;
         screenReaderText?: string | undefined;
         tooltip?: string | undefined;
         altText?: string | undefined;
@@ -208,6 +209,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
         validationMessage?: string | undefined;
         default?: any;
         value?: any;
+        displayValueExpression?: string | undefined;
         emptyValue?: "" | "undefined" | "null" | undefined;
         checked?: boolean | undefined;
         _dependents?: string[] | undefined;

package/lib/Field.js

@@ -177,6 +177,9 @@ class Field extends Scriptable_1.default {
     get displayFormat() {
         return this.withCategory(this._jsonModel.displayFormat);
     }
+    get displayValueExpression() {
+        return this._jsonModel.displayValueExpression;
+    }
     get placeholder() {
         return this._jsonModel.placeholder;
     }
@@ -244,7 +247,6 @@ class Field extends Scriptable_1.default {
     }
     set required(r) {
         this._setProperty('required', r);
-        this.validate();
     }
     get maximum() {
         if (this.type === 'number' || this.format === 'date' || this.type === 'integer') {
@@ -296,6 +298,9 @@ class Field extends Scriptable_1.default {
         }
     }
     get displayValue() {
+        if (this.displayValueExpression && typeof this.displayValueExpression === 'string' && this.displayValueExpression.length !== 0) {
+            return this.executeExpression(this.displayValueExpression);
+        }
         const df = this.displayFormat;
         if (df && this.isNotEmpty(this.value) && this.valid !== false) {
             try {

package/lib/Form.d.ts

@@ -91,14 +91,16 @@ declare class Form extends Container<FormJson> implements FormModel {
         columnClassNames?: undefined;
         columnCount?: undefined;
         gridClassNames?: undefined;
+        ':type': string;
+        repeatable?: boolean | undefined;
+        minOccur?: number | undefined;
+        maxOccur?: number | undefined;
         properties: {
             [key: string]: any;
         };
         index: number;
         parent: undefined;
         qualifiedName: any;
-        repeatable: boolean | undefined;
-        ':type': string;
         id: string;
     };
     get type(): string;

package/lib/rules/FunctionRuntime.js

@@ -202,6 +202,27 @@ class FunctionRuntimeImpl {
                                 },
                                 exportData: () => {
                                     return FunctionRuntimeImpl.getInstance().getFunctions().exportData._func.call(undefined, args, data, interpreter);
+                                },
+                                submitForm: (payload, validateForm, contentType) => {
+                                    const submitAs = contentType || 'multipart/form-data';
+                                    const args = [payload, validateForm, submitAs];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().submitForm._func.call(undefined, args, data, interpreter);
+                                },
+                                markFieldAsInvalid: (fieldIdentifier, validationMessage, option) => {
+                                    var _a, _b;
+                                    if (!option || option.useId) {
+                                        (_a = interpreter.globals.form.getElement(fieldIdentifier)) === null || _a === void 0 ? void 0 : _a.markAsInvalid(validationMessage);
+                                    }
+                                    else if (option && option.useDataRef) {
+                                        interpreter.globals.form.visit(function callback(f) {
+                                            if (f.dataRef === fieldIdentifier) {
+                                                f.markAsInvalid(validationMessage);
+                                            }
+                                        });
+                                    }
+                                    else if (option && option.useQualifiedName) {
+                                        (_b = interpreter.globals.form.resolveQualifiedName(fieldIdentifier)) === null || _b === void 0 ? void 0 : _b.markAsInvalid(validationMessage);
+                                    }
                                 }
                             }
                         };
@@ -303,11 +324,24 @@ class FunctionRuntimeImpl {
             },
             submitForm: {
                 _func: (args, data, interpreter) => {
-                    const success = toString(args[0]);
-                    const error = toString(args[1]);
-                    const submit_as = args.length > 2 ? toString(args[2]) : 'multipart/form-data';
-                    const submit_data = args.length > 3 ? valueOf(args[3]) : null;
-                    const validate_form = args.length > 4 ? valueOf(args[4]) : true;
+                    let success = null;
+                    let error = null;
+                    let submit_data;
+                    let validate_form;
+                    let submit_as;
+                    if (args.length > 0 && typeof valueOf(args[0]) === 'object') {
+                        submit_data = args.length > 0 ? valueOf(args[0]) : null;
+                        validate_form = args.length > 1 ? valueOf(args[1]) : true;
+                        submit_as = args.length > 2 ? toString(args[2]) : 'multipart/form-data';
+                    }
+                    else {
+                        interpreter.globals.form.logger.warn('This usage of submitForm is deprecated. Please see the documentation and update');
+                        success = toString(args[0]);
+                        error = toString(args[1]);
+                        submit_as = args.length > 2 ? toString(args[2]) : 'multipart/form-data';
+                        submit_data = args.length > 3 ? valueOf(args[3]) : null;
+                        validate_form = args.length > 4 ? valueOf(args[4]) : true;
+                    }
                     interpreter.globals.form.dispatch(new Events_1.Submit({
                         success,
                         error,

package/lib/types/Json.d.ts

@@ -99,6 +99,7 @@ export declare type FieldJson = BaseJson & TranslationFieldJson & {
     editFormat?: string;
     editValue?: string;
     displayValue?: string;
+    displayValueExpression?: string;
     emptyValue?: 'null' | 'undefined' | '';
     checked?: boolean;
 };

package/lib/types/Model.d.ts

@@ -78,6 +78,7 @@ export interface FieldModel extends BaseModel, ScriptableField, WithState<FieldJ
     readonly editFormat?: string;
     readonly displayFormat?: string;
     readonly displayValue?: string;
+    readonly displayValueExpression?: string;
     readonly editValue?: string;
 }
 export interface FormMetaDataModel {

package/lib/utils/ValidationUtils.d.ts

@@ -12,7 +12,8 @@ declare type ValidConstraintsType = {
     email: ValidationConstraints[];
 };
 export declare const ValidConstraints: ValidConstraintsType;
-export declare type ValidationConstraints = 'type' | 'format' | 'minimum' | 'maximum' | 'exclusiveMinimum' | 'exclusiveMaximum' | 'minItems' | 'maxItems' | 'uniqueItems' | 'minLength' | 'maxLength' | 'pattern' | 'required' | 'enum' | 'accept' | 'maxFileSize';
+export declare const validationConstraintsList: readonly ["type", "format", "minimum", "maximum", "exclusiveMinimum", "exclusiveMaximum", "minItems", "maxItems", "uniqueItems", "minLength", "maxLength", "pattern", "required", "enum", "accept", "maxFileSize"];
+export declare type ValidationConstraints = typeof validationConstraintsList[number];
 declare type ConstraintsObject = {
     [key in ValidationConstraints]: (constraint: any, inputVal: any) => ValidationResult;
 };

package/lib/utils/ValidationUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Constraints = exports.ValidConstraints = exports.coerceType = void 0;
+exports.Constraints = exports.validationConstraintsList = exports.ValidConstraints = exports.coerceType = void 0;
 const FormUtils_1 = require("./FormUtils");
 const FileObject_1 = require("../FileObject");
 const dateRegex = /^(\d{4})-(\d{1,2})-(\d{1,2})$/;
@@ -118,6 +118,8 @@ exports.ValidConstraints = {
     file: ['accept', 'maxFileSize'],
     email: ['minLength', 'maxLength', 'format', 'pattern']
 };
+exports.validationConstraintsList = ['type', 'format', 'minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum', 'minItems',
+    'maxItems', 'uniqueItems', 'minLength', 'maxLength', 'pattern', 'required', 'enum', 'accept', 'maxFileSize'];
 exports.Constraints = {
     type: (constraint, inputVal) => {
         let value = inputVal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.74",
+  "version": "0.22.76",
   "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.74"
+    "@aemforms/af-formatters": "^0.22.76"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",