@aemforms/af-core 0.22.78 → 0.22.79

package/esm/afb-events.js

@@ -3,6 +3,7 @@ class ActionImpl {
     _type;
     _payload;
     _target;
+    _currentTarget;
     constructor(payload, type, _metadata) {
         this._metadata = _metadata;
         this._payload = payload;
@@ -20,6 +21,9 @@ class ActionImpl {
     get target() {
         return this._target;
     }
+    get currentTarget() {
+        return this._currentTarget;
+    }
     get isCustomEvent() {
         return false;
     }

package/esm/afb-runtime.js

@@ -1131,9 +1131,17 @@ const staticFields = ['plain-text', 'image'];
 class ActionImplWithTarget {
     _action;
     _target;
+    _currentTarget;
     constructor(_action, _target) {
         this._action = _action;
-        this._target = _target;
+        if (_action.target) {
+            this._currentTarget = _target;
+            this._target = _action.target;
+        }
+        else {
+            this._target = _target;
+            this._currentTarget = _target;
+        }
     }
     get type() {
         return this._action.type;
@@ -1147,6 +1155,9 @@ class ActionImplWithTarget {
     get target() {
         return this._target;
     }
+    get currentTarget() {
+        return this._currentTarget;
+    }
     get isCustomEvent() {
         return this._action.isCustomEvent;
     }
@@ -1331,9 +1342,12 @@ class BaseNode {
         return this._jsonModel.uniqueItems;
     }
     isTransparent() {
-        const isNonTransparent = this.parent?._jsonModel.type === 'array';
+        const isNonTransparent = this.parent?._jsonModel?.type === 'array';
         return !this._jsonModel.name && !isNonTransparent;
     }
+    getDependents() {
+        return this._dependents.map(x => x.node.id);
+    }
     getState(forRestore = false) {
         return {
             ...this._jsonModel,
@@ -1348,7 +1362,7 @@ class BaseNode {
             } : {}),
             ':type': this[':type'],
             ...(forRestore ? {
-                _dependents: this._dependents.length ? this._dependents.map(x => x.node.id) : undefined,
+                _dependents: this._dependents.length ? this.getDependents() : undefined,
                 allowedComponents: undefined,
                 columnClassNames: undefined,
                 columnCount: undefined,
@@ -1374,7 +1388,12 @@ class BaseNode {
                     return propsToLook.indexOf(x.propertyName) > -1;
                 }) > -1;
                 if (isPropChanged) {
-                    dependent.dispatch(new ExecuteRule());
+                    if (this.form.changeEventBehaviour === 'deps') {
+                        dependent.dispatch(change);
+                    }
+                    else {
+                        dependent.dispatch(new ExecuteRule());
+                    }
                 }
             });
             this._dependents.push({ node: dependent, subscription });
@@ -1651,16 +1670,23 @@ class Scriptable extends BaseNode {
         return this._events[eName] || [];
     }
     applyUpdates(updates) {
-        Object.entries(updates).forEach(([key, value]) => {
-            if (key in editableProperties || (key in this && typeof this[key] !== 'function')) {
-                try {
-                    this[key] = value;
-                }
-                catch (e) {
-                    console.error(e);
-                }
+        if (typeof updates === 'object') {
+            if (updates !== null) {
+                Object.entries(updates).forEach(([key, value]) => {
+                    if (key in editableProperties || (key in this && typeof this[key] !== 'function')) {
+                        try {
+                            this[key] = value;
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                    }
+                });
             }
-        });
+        }
+        else if (typeof updates !== 'undefined') {
+            this.value = updates;
+        }
     }
     executeAllRules(context) {
         const entries = Object.entries(this.getRules());
@@ -1748,6 +1774,11 @@ class Scriptable extends BaseNode {
         const node = this.ruleEngine.compileRule(expr, this.lang);
         return this.ruleEngine.execute(node, this.getExpressionScope(), ruleContext);
     }
+    change(event, context) {
+        if (this.form.changeEventBehaviour === 'deps') {
+            this.executeAllRules(context);
+        }
+    }
     executeAction(action) {
         const context = {
             'form': this.form,
@@ -1767,7 +1798,9 @@ class Scriptable extends BaseNode {
             this[funcName](action, context);
         }
         node.forEach((n) => this.executeEvent(context, n));
-        this.notifyDependents(action);
+        if (action.target === this) {
+            this.notifyDependents(action);
+        }
     }
 }
 
@@ -2860,6 +2893,52 @@ class FunctionRuntimeImpl {
 }
 const FunctionRuntime = FunctionRuntimeImpl.getInstance();
 
+class Version {
+    #minor;
+    #major;
+    #subVersion;
+    #invalid = true;
+    constructor(n) {
+        const match = n.match(/([^.]+)\.([^.]+)(?:\.(.+))?/);
+        if (match) {
+            this.#major = +match[1];
+            this.#minor = +match[2];
+            this.#subVersion = match[3] ? +match[3] : 0;
+            if (isNaN(this.#major) || isNaN(this.#minor) || isNaN(this.#subVersion)) {
+                throw new Error('Invalid version string ' + n);
+            }
+        }
+        else {
+            throw new Error('Invalid version string ' + n);
+        }
+    }
+    get major() {
+        return this.#major;
+    }
+    get minor() {
+        return this.#minor;
+    }
+    get subversion() {
+        return this.#subVersion;
+    }
+    completeMatch(v) {
+        return this.major === v.major &&
+            this.minor === v.minor &&
+            this.#subVersion === v.subversion;
+    }
+    lessThan(v) {
+        return this.major < v.major || (this.major === v.major && (this.minor < v.minor)) || (this.major === v.major && this.minor === v.minor && this.#subVersion < v.subversion);
+    }
+    toString() {
+        return `${this.major}.${this.minor}.${this.subversion}`;
+    }
+    valueOf() {
+        return this.toString();
+    }
+}
+
+const currentVersion = new Version('0.13');
+const changeEventVersion = new Version('0.13');
 class Form extends Container {
     _ruleEngine;
     _eventQueue;
@@ -2871,9 +2950,15 @@ class Form extends Container {
         this._ruleEngine = _ruleEngine;
         this._eventQueue = _eventQueue;
         this._logger = new Logger(logLevel);
+        this._applyDefaultsInModel();
         if (mode === 'create') {
             this.queueEvent(new Initialize());
-            this.queueEvent(new ExecuteRule());
+            if (this.changeEventBehaviour === 'deps') {
+                this.queueEvent(new Change({ changes: [] }));
+            }
+            else {
+                this.queueEvent(new ExecuteRule());
+            }
         }
         this._ids = IdGenerator();
         this._bindToDataModel(new DataGroup('$form', {}));
@@ -2882,10 +2967,21 @@ class Form extends Container {
             this.queueEvent(new FormLoad());
         }
     }
+    _applyDefaultsInModel() {
+        const current = this.specVersion;
+        this._jsonModel.properties = this._jsonModel.properties || {};
+        if (current.lessThan(changeEventVersion) ||
+            typeof this._jsonModel.properties['fd:changeEventBehaviour'] !== 'string') {
+            this._jsonModel.properties['fd:changeEventBehaviour'] = 'self';
+        }
+    }
     _logger;
     get logger() {
         return this._logger;
     }
+    get changeEventBehaviour() {
+        return this.properties['fd:changeEventBehaviour'] === 'deps' ? 'deps' : 'self';
+    }
     dataRefRegex = /("[^"]+?"|[^.]+?)(?:\.|$)/g;
     get metaData() {
         const metaData = this._jsonModel.metadata || {};
@@ -2902,6 +2998,21 @@ class Form extends Container {
     exportData() {
         return this.getDataNode()?.$value;
     }
+    get specVersion() {
+        if (typeof this._jsonModel.adaptiveform === 'string') {
+            try {
+                return new Version(this._jsonModel.adaptiveform);
+            }
+            catch (e) {
+                console.log(e);
+                console.log('Falling back to default version' + currentVersion.toString());
+                return currentVersion;
+            }
+        }
+        else {
+            return currentVersion;
+        }
+    }
     resolveQualifiedName(qualifiedName) {
         let foundFormElement = null;
         this.visit(formElement => {
@@ -3041,7 +3152,7 @@ class Form extends Container {
         }, 'valid');
         field.subscribe((action) => {
             const field = action.target.getState();
-            if (field) {
+            if (action.payload.changes.length > 0 && field) {
                 const shallowClone = (obj) => {
                     if (obj && typeof obj === 'object') {
                         if (Array.isArray(obj)) {
@@ -3277,7 +3388,12 @@ class Field extends Scriptable {
         if (_options.mode !== 'restore') {
             this._applyDefaults();
             this.queueEvent(new Initialize());
-            this.queueEvent(new ExecuteRule());
+            if (this.form.changeEventBehaviour === 'deps') {
+                this.queueEvent(new Change({ changes: [] }));
+            }
+            else {
+                this.queueEvent(new ExecuteRule());
+            }
         }
     }
     _ruleNodeReference = [];
@@ -4336,9 +4452,11 @@ const FormFieldFactory = new FormFieldFactoryImpl();
 const createFormInstance = (formModel, callback, logLevel = 'error', fModel = undefined) => {
     try {
         let f = fModel;
-        if (f == null) {
-            formModel = sitesModelToFormModel(formModel);
-            f = new Form({ ...formModel }, FormFieldFactory, new RuleEngine(), new EventQueue(new Logger(logLevel)), logLevel);
+        {
+            if (f == null) {
+                formModel = sitesModelToFormModel(formModel);
+                f = new Form({ ...formModel }, FormFieldFactory, new RuleEngine(), new EventQueue(new Logger(logLevel)), logLevel);
+            }
         }
         const formData = formModel?.data;
         if (formData) {
@@ -4355,6 +4473,7 @@ const createFormInstance = (formModel, callback, logLevel = 'error', fModel = un
         throw new Error(e);
     }
 };
+createFormInstance.currentVersion = currentVersion;
 const defaultOptions = {
     logLevel: 'error'
 };

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

@@ -50,6 +50,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     set label(l: import("./types/Json").Label | undefined);
     get uniqueItems(): boolean | undefined;
     isTransparent(): boolean;
+    getDependents(): string[];
     getState(forRestore?: boolean): T & {
         _dependents?: string[] | undefined;
         allowedComponents?: undefined;

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

@@ -5,6 +5,8 @@ import SubmitMetaData from './SubmitMetaData';
 import EventQueue from './controller/EventQueue';
 import { Logger, LogLevel } from './controller/Logger';
 import RuleEngine from './rules/RuleEngine';
+import { Version } from './utils/Version';
+export declare const currentVersion: Version;
 declare class Form extends Container<FormJson> implements FormModel {
     #private;
     private _ruleEngine;
@@ -13,13 +15,16 @@ declare class Form extends Container<FormJson> implements FormModel {
     _ids: Generator<string, void, string>;
     private _invalidFields;
     constructor(n: FormJson, fieldFactory: IFormFieldFactory, _ruleEngine: RuleEngine, _eventQueue?: EventQueue, logLevel?: LogLevel, mode?: FormCreationMode);
+    protected _applyDefaultsInModel(): void;
     private _logger;
     get logger(): Logger;
+    get changeEventBehaviour(): "deps" | "self";
     private dataRefRegex;
     get metaData(): FormMetaData;
     get action(): string | undefined;
     importData(dataModel: any): void;
     exportData(): any;
+    get specVersion(): Version;
     resolveQualifiedName(qualifiedName: string): FieldModel | FieldsetModel | null;
     exportSubmitMetaData(): SubmitMetaData;
     setFocus(field: BaseModel, focusOption: FocusOption): void;
@@ -78,7 +83,7 @@ declare class Form extends Container<FormJson> implements FormModel {
         data?: any;
         title?: string | undefined;
         action?: string | undefined;
-        adaptiveForm?: string | undefined;
+        adaptiveform?: string | undefined;
         lang?: string | undefined;
     } & {
         items: any[];

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

@@ -1,7 +1,10 @@
 import { FormModel } from './types/index';
 import { LogLevel } from './controller/Logger';
 import { CustomFunction, FunctionDefinition } from './rules/FunctionRuntime';
-export declare const createFormInstance: (formModel: any, callback?: ((f: FormModel) => any) | undefined, logLevel?: LogLevel, fModel?: any) => FormModel;
+export declare const createFormInstance: {
+    (formModel: any, callback?: ((f: FormModel) => any) | undefined, logLevel?: LogLevel, fModel?: any): FormModel;
+    currentVersion: import("./utils/Version").Version;
+};
 export declare const restoreFormInstance: (formModel: any, data?: any, { logLevel }?: {
     logLevel: LogLevel;
 }) => FormModel;

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

@@ -12,6 +12,7 @@ declare abstract class Scriptable<T extends RulesJson> extends BaseNode<T> imple
     private executeEvent;
     executeRule(event: Action, context: any): void;
     executeExpression(expr: string): any;
+    change(event: Action, context: any): void;
     executeAction(action: Action): void;
 }
 export default Scriptable;

package/esm/types/src/controller/Events.d.ts

@@ -4,11 +4,13 @@ declare class ActionImpl implements Action {
     protected _type: string;
     private _payload?;
     private _target;
+    private _currentTarget;
     constructor(payload: any, type: string, _metadata?: any);
     get type(): string;
     get payload(): any;
     get metadata(): any;
     get target(): FormModel | FieldModel | FieldsetModel;
+    get currentTarget(): FormModel | FieldModel | FieldsetModel;
     get isCustomEvent(): boolean;
     protected payloadToJson(): any;
     toJson(): {

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

@@ -117,7 +117,7 @@ export type FormJson = ContainerJson & {
     data?: any;
     title?: string;
     action?: string;
-    adaptiveForm?: string;
+    adaptiveform?: string;
     lang?: string;
 };
 export type TranslationJson = TranslationBaseJson & TranslationFieldJson & TranslationConstraintsJson;

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

@@ -3,6 +3,7 @@ import RuleEngine from '../rules/RuleEngine';
 import EventQueue from '../controller/EventQueue';
 import DataGroup from '../data/DataGroup';
 import { Logger } from '../controller/Logger';
+import { Version } from '../utils/Version';
 export interface ScriptableField {
     rules?: {
         [key: string]: string;
@@ -10,7 +11,7 @@ export interface ScriptableField {
     events?: {
         [key: string]: string;
     };
-    ruleEngine: RuleEngine;
+    readonly ruleEngine: RuleEngine;
 }
 interface WithState<T> {
     getState: () => any;
@@ -33,6 +34,7 @@ export interface Action {
     readonly isCustomEvent: boolean;
     readonly target: FormModel | FieldModel | FieldsetModel;
     readonly originalAction?: Action;
+    readonly currentTarget: FormModel | FieldModel | FieldsetModel;
 }
 export type callbackFn = (action: Action) => void;
 export interface WithController {
@@ -82,7 +84,7 @@ export interface FieldModel extends BaseModel, ScriptableField, WithState<FieldJ
     readonly editValue?: string;
 }
 export interface FormMetaDataModel {
-    readonly version: string;
+    readonly version?: string;
     readonly grammar: string;
 }
 export interface SubmitMetaDataModel {
@@ -105,6 +107,7 @@ export interface FormModel extends ContainerModel, WithState<FormJson> {
     readonly metadata?: MetaDataJson;
     readonly title: string;
     readonly logger: Logger;
+    readonly specVersion: Version;
     importData(data: any): any;
     exportData(): any;
     getElement(id: string): FieldModel | FormModel | FieldsetModel;
@@ -113,6 +116,7 @@ export interface FormModel extends ContainerModel, WithState<FormJson> {
     visit(callBack: (field: FieldModel | FieldsetModel) => void): void;
     resolveQualifiedName(qualifiedName: string): FieldModel | FieldsetModel | null;
     fieldAdded(field: FieldModel | FieldsetModel): void;
+    readonly changeEventBehaviour: 'deps' | 'self';
 }
 export interface IFormFieldFactory {
     createField(child: FieldsetJson | FieldJson, options: {

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

@@ -0,0 +1,11 @@
+export declare class Version {
+    #private;
+    constructor(n: string);
+    get major(): number;
+    get minor(): number;
+    get subversion(): number;
+    completeMatch(v: Version): boolean;
+    lessThan(v: Version): boolean;
+    toString(): string;
+    valueOf(): string;
+}

package/lib/BaseNode.d.ts

@@ -50,6 +50,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     set label(l: import("./types/Json").Label | undefined);
     get uniqueItems(): boolean | undefined;
     isTransparent(): boolean;
+    getDependents(): string[];
     getState(forRestore?: boolean): T & {
         _dependents?: string[] | undefined;
         allowedComponents?: undefined;

package/lib/BaseNode.js

@@ -44,7 +44,14 @@ exports.staticFields = ['plain-text', 'image'];
 class ActionImplWithTarget {
     constructor(_action, _target) {
         this._action = _action;
-        this._target = _target;
+        if (_action.target) {
+            this._currentTarget = _target;
+            this._target = _action.target;
+        }
+        else {
+            this._target = _target;
+            this._currentTarget = _target;
+        }
     }
     get type() {
         return this._action.type;
@@ -58,6 +65,9 @@ class ActionImplWithTarget {
     get target() {
         return this._target;
     }
+    get currentTarget() {
+        return this._currentTarget;
+    }
     get isCustomEvent() {
         return this._action.isCustomEvent;
     }
@@ -236,17 +246,20 @@ class BaseNode {
         return this._jsonModel.uniqueItems;
     }
     isTransparent() {
-        var _a;
-        const isNonTransparent = ((_a = this.parent) === null || _a === void 0 ? void 0 : _a._jsonModel.type) === 'array';
+        var _a, _b;
+        const isNonTransparent = ((_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a._jsonModel) === null || _b === void 0 ? void 0 : _b.type) === 'array';
         return !this._jsonModel.name && !isNonTransparent;
     }
+    getDependents() {
+        return this._dependents.map(x => x.node.id);
+    }
     getState(forRestore = false) {
         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,
+            _dependents: this._dependents.length ? this.getDependents() : undefined,
             allowedComponents: undefined,
             columnClassNames: undefined,
             columnCount: undefined,
@@ -271,7 +284,12 @@ class BaseNode {
                     return propsToLook.indexOf(x.propertyName) > -1;
                 }) > -1;
                 if (isPropChanged) {
-                    dependent.dispatch(new Events_1.ExecuteRule());
+                    if (this.form.changeEventBehaviour === 'deps') {
+                        dependent.dispatch(change);
+                    }
+                    else {
+                        dependent.dispatch(new Events_1.ExecuteRule());
+                    }
                 }
             });
             this._dependents.push({ node: dependent, subscription });

package/lib/Field.js

@@ -34,7 +34,12 @@ class Field extends Scriptable_1.default {
         if (_options.mode !== 'restore') {
             this._applyDefaults();
             this.queueEvent(new Events_1.Initialize());
-            this.queueEvent(new Events_1.ExecuteRule());
+            if (this.form.changeEventBehaviour === 'deps') {
+                this.queueEvent(new Events_1.Change({ changes: [] }));
+            }
+            else {
+                this.queueEvent(new Events_1.ExecuteRule());
+            }
         }
     }
     _initialize() {

package/lib/Form.d.ts

@@ -5,6 +5,8 @@ import SubmitMetaData from './SubmitMetaData';
 import EventQueue from './controller/EventQueue';
 import { Logger, LogLevel } from './controller/Logger';
 import RuleEngine from './rules/RuleEngine';
+import { Version } from './utils/Version';
+export declare const currentVersion: Version;
 declare class Form extends Container<FormJson> implements FormModel {
     #private;
     private _ruleEngine;
@@ -13,13 +15,16 @@ declare class Form extends Container<FormJson> implements FormModel {
     _ids: Generator<string, void, string>;
     private _invalidFields;
     constructor(n: FormJson, fieldFactory: IFormFieldFactory, _ruleEngine: RuleEngine, _eventQueue?: EventQueue, logLevel?: LogLevel, mode?: FormCreationMode);
+    protected _applyDefaultsInModel(): void;
     private _logger;
     get logger(): Logger;
+    get changeEventBehaviour(): "deps" | "self";
     private dataRefRegex;
     get metaData(): FormMetaData;
     get action(): string | undefined;
     importData(dataModel: any): void;
     exportData(): any;
+    get specVersion(): Version;
     resolveQualifiedName(qualifiedName: string): FieldModel | FieldsetModel | null;
     exportSubmitMetaData(): SubmitMetaData;
     setFocus(field: BaseModel, focusOption: FocusOption): void;
@@ -78,7 +83,7 @@ declare class Form extends Container<FormJson> implements FormModel {
         data?: any;
         title?: string | undefined;
         action?: string | undefined;
-        adaptiveForm?: string | undefined;
+        adaptiveform?: string | undefined;
         lang?: string | undefined;
     } & {
         items: any[];

package/lib/Form.js

@@ -9,6 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _Form_instances, _Form_getNavigableChildren, _Form_getFirstNavigableChild, _Form_setActiveFirstDeepChild, _Form_getNextItem, _Form_getPreviousItem, _Form_clearCurrentFocus;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.currentVersion = void 0;
 const Container_1 = __importDefault(require("./Container"));
 const index_1 = require("./types/index");
 const FormMetaData_1 = __importDefault(require("./FormMetaData"));
@@ -19,6 +20,9 @@ const FormUtils_1 = require("./utils/FormUtils");
 const DataGroup_1 = __importDefault(require("./data/DataGroup"));
 const FunctionRuntime_1 = require("./rules/FunctionRuntime");
 const Events_1 = require("./controller/Events");
+const Version_1 = require("./utils/Version");
+exports.currentVersion = new Version_1.Version('0.13');
+const changeEventVersion = new Version_1.Version('0.13');
 class Form extends Container_1.default {
     constructor(n, fieldFactory, _ruleEngine, _eventQueue = new EventQueue_1.default(), logLevel = 'off', mode = 'create') {
         super(n, { fieldFactory: fieldFactory, mode });
@@ -29,9 +33,15 @@ class Form extends Container_1.default {
         this._invalidFields = [];
         this.dataRefRegex = /("[^"]+?"|[^.]+?)(?:\.|$)/g;
         this._logger = new Logger_1.Logger(logLevel);
+        this._applyDefaultsInModel();
         if (mode === 'create') {
             this.queueEvent(new Events_1.Initialize());
-            this.queueEvent(new Events_1.ExecuteRule());
+            if (this.changeEventBehaviour === 'deps') {
+                this.queueEvent(new Events_1.Change({ changes: [] }));
+            }
+            else {
+                this.queueEvent(new Events_1.ExecuteRule());
+            }
         }
         this._ids = (0, FormUtils_1.IdGenerator)();
         this._bindToDataModel(new DataGroup_1.default('$form', {}));
@@ -40,9 +50,20 @@ class Form extends Container_1.default {
             this.queueEvent(new Events_1.FormLoad());
         }
     }
+    _applyDefaultsInModel() {
+        const current = this.specVersion;
+        this._jsonModel.properties = this._jsonModel.properties || {};
+        if (current.lessThan(changeEventVersion) ||
+            typeof this._jsonModel.properties['fd:changeEventBehaviour'] !== 'string') {
+            this._jsonModel.properties['fd:changeEventBehaviour'] = 'self';
+        }
+    }
     get logger() {
         return this._logger;
     }
+    get changeEventBehaviour() {
+        return this.properties['fd:changeEventBehaviour'] === 'deps' ? 'deps' : 'self';
+    }
     get metaData() {
         const metaData = this._jsonModel.metadata || {};
         return new FormMetaData_1.default(metaData);
@@ -59,6 +80,21 @@ class Form extends Container_1.default {
         var _a;
         return (_a = this.getDataNode()) === null || _a === void 0 ? void 0 : _a.$value;
     }
+    get specVersion() {
+        if (typeof this._jsonModel.adaptiveform === 'string') {
+            try {
+                return new Version_1.Version(this._jsonModel.adaptiveform);
+            }
+            catch (e) {
+                console.log(e);
+                console.log('Falling back to default version' + exports.currentVersion.toString());
+                return exports.currentVersion;
+            }
+        }
+        else {
+            return exports.currentVersion;
+        }
+    }
     resolveQualifiedName(qualifiedName) {
         let foundFormElement = null;
         this.visit(formElement => {
@@ -159,7 +195,7 @@ class Form extends Container_1.default {
         }, 'valid');
         field.subscribe((action) => {
             const field = action.target.getState();
-            if (field) {
+            if (action.payload.changes.length > 0 && field) {
                 const shallowClone = (obj) => {
                     if (obj && typeof obj === 'object') {
                         if (Array.isArray(obj)) {

package/lib/FormInstance.d.ts

@@ -1,7 +1,10 @@
 import { FormModel } from './types/index';
 import { LogLevel } from './controller/Logger';
 import { CustomFunction, FunctionDefinition } from './rules/FunctionRuntime';
-export declare const createFormInstance: (formModel: any, callback?: ((f: FormModel) => any) | undefined, logLevel?: LogLevel, fModel?: any) => FormModel;
+export declare const createFormInstance: {
+    (formModel: any, callback?: ((f: FormModel) => any) | undefined, logLevel?: LogLevel, fModel?: any): FormModel;
+    currentVersion: import("./utils/Version").Version;
+};
 export declare const restoreFormInstance: (formModel: any, data?: any, { logLevel }?: {
     logLevel: LogLevel;
 }) => FormModel;

package/lib/FormInstance.js

@@ -1,10 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerFunctions = exports.fetchForm = exports.validateFormData = exports.validateFormInstance = exports.restoreFormInstance = exports.createFormInstance = void 0;
-const Form_1 = __importDefault(require("./Form"));
+const Form_1 = __importStar(require("./Form"));
 const JsonUtils_1 = require("./utils/JsonUtils");
 const Fetch_1 = require("./utils/Fetch");
 const RuleEngine_1 = __importDefault(require("./rules/RuleEngine"));
@@ -17,9 +40,11 @@ const DataGroup_1 = __importDefault(require("./data/DataGroup"));
 const createFormInstance = (formModel, callback, logLevel = 'error', fModel = undefined) => {
     try {
         let f = fModel;
-        if (f == null) {
-            formModel = (0, FormUtils_1.sitesModelToFormModel)(formModel);
-            f = new Form_1.default(Object.assign({}, formModel), FormCreationUtils_1.FormFieldFactory, new RuleEngine_1.default(), new EventQueue_1.default(new Logger_1.Logger(logLevel)), logLevel);
+        {
+            if (f == null) {
+                formModel = (0, FormUtils_1.sitesModelToFormModel)(formModel);
+                f = new Form_1.default(Object.assign({}, formModel), FormCreationUtils_1.FormFieldFactory, new RuleEngine_1.default(), new EventQueue_1.default(new Logger_1.Logger(logLevel)), logLevel);
+            }
         }
         const formData = formModel === null || formModel === void 0 ? void 0 : formModel.data;
         if (formData) {
@@ -37,6 +62,7 @@ const createFormInstance = (formModel, callback, logLevel = 'error', fModel = un
     }
 };
 exports.createFormInstance = createFormInstance;
+exports.createFormInstance.currentVersion = Form_1.currentVersion;
 const defaultOptions = {
     logLevel: 'error'
 };

package/lib/Scriptable.d.ts

@@ -12,6 +12,7 @@ declare abstract class Scriptable<T extends RulesJson> extends BaseNode<T> imple
     private executeEvent;
     executeRule(event: Action, context: any): void;
     executeExpression(expr: string): any;
+    change(event: Action, context: any): void;
     executeAction(action: Action): void;
 }
 export default Scriptable;

package/lib/Scriptable.js

@@ -49,16 +49,23 @@ class Scriptable extends BaseNode_1.BaseNode {
         return this._events[eName] || [];
     }
     applyUpdates(updates) {
-        Object.entries(updates).forEach(([key, value]) => {
-            if (key in BaseNode_1.editableProperties || (key in this && typeof this[key] !== 'function')) {
-                try {
-                    this[key] = value;
-                }
-                catch (e) {
-                    console.error(e);
-                }
+        if (typeof updates === 'object') {
+            if (updates !== null) {
+                Object.entries(updates).forEach(([key, value]) => {
+                    if (key in BaseNode_1.editableProperties || (key in this && typeof this[key] !== 'function')) {
+                        try {
+                            this[key] = value;
+                        }
+                        catch (e) {
+                            console.error(e);
+                        }
+                    }
+                });
             }
-        });
+        }
+        else if (typeof updates !== 'undefined') {
+            this.value = updates;
+        }
     }
     executeAllRules(context) {
         const entries = Object.entries(this.getRules());
@@ -146,6 +153,11 @@ class Scriptable extends BaseNode_1.BaseNode {
         const node = this.ruleEngine.compileRule(expr, this.lang);
         return this.ruleEngine.execute(node, this.getExpressionScope(), ruleContext);
     }
+    change(event, context) {
+        if (this.form.changeEventBehaviour === 'deps') {
+            this.executeAllRules(context);
+        }
+    }
     executeAction(action) {
         const context = {
             'form': this.form,
@@ -165,7 +177,9 @@ class Scriptable extends BaseNode_1.BaseNode {
             this[funcName](action, context);
         }
         node.forEach((n) => this.executeEvent(context, n));
-        this.notifyDependents(action);
+        if (action.target === this) {
+            this.notifyDependents(action);
+        }
     }
 }
 exports.default = Scriptable;

package/lib/controller/Events.d.ts

@@ -4,11 +4,13 @@ declare class ActionImpl implements Action {
     protected _type: string;
     private _payload?;
     private _target;
+    private _currentTarget;
     constructor(payload: any, type: string, _metadata?: any);
     get type(): string;
     get payload(): any;
     get metadata(): any;
     get target(): FormModel | FieldModel | FieldsetModel;
+    get currentTarget(): FormModel | FieldModel | FieldsetModel;
     get isCustomEvent(): boolean;
     protected payloadToJson(): any;
     toJson(): {

package/lib/controller/Events.js

@@ -19,6 +19,9 @@ class ActionImpl {
     get target() {
         return this._target;
     }
+    get currentTarget() {
+        return this._currentTarget;
+    }
     get isCustomEvent() {
         return false;
     }

package/lib/types/Json.d.ts

@@ -117,7 +117,7 @@ export declare type FormJson = ContainerJson & {
     data?: any;
     title?: string;
     action?: string;
-    adaptiveForm?: string;
+    adaptiveform?: string;
     lang?: string;
 };
 export declare type TranslationJson = TranslationBaseJson & TranslationFieldJson & TranslationConstraintsJson;

package/lib/types/Model.d.ts

@@ -3,6 +3,7 @@ import RuleEngine from '../rules/RuleEngine';
 import EventQueue from '../controller/EventQueue';
 import DataGroup from '../data/DataGroup';
 import { Logger } from '../controller/Logger';
+import { Version } from '../utils/Version';
 export interface ScriptableField {
     rules?: {
         [key: string]: string;
@@ -10,7 +11,7 @@ export interface ScriptableField {
     events?: {
         [key: string]: string;
     };
-    ruleEngine: RuleEngine;
+    readonly ruleEngine: RuleEngine;
 }
 interface WithState<T> {
     getState: () => any;
@@ -33,6 +34,7 @@ export interface Action {
     readonly isCustomEvent: boolean;
     readonly target: FormModel | FieldModel | FieldsetModel;
     readonly originalAction?: Action;
+    readonly currentTarget: FormModel | FieldModel | FieldsetModel;
 }
 export declare type callbackFn = (action: Action) => void;
 export interface WithController {
@@ -82,7 +84,7 @@ export interface FieldModel extends BaseModel, ScriptableField, WithState<FieldJ
     readonly editValue?: string;
 }
 export interface FormMetaDataModel {
-    readonly version: string;
+    readonly version?: string;
     readonly grammar: string;
 }
 export interface SubmitMetaDataModel {
@@ -105,6 +107,7 @@ export interface FormModel extends ContainerModel, WithState<FormJson> {
     readonly metadata?: MetaDataJson;
     readonly title: string;
     readonly logger: Logger;
+    readonly specVersion: Version;
     importData(data: any): any;
     exportData(): any;
     getElement(id: string): FieldModel | FormModel | FieldsetModel;
@@ -113,6 +116,7 @@ export interface FormModel extends ContainerModel, WithState<FormJson> {
     visit(callBack: (field: FieldModel | FieldsetModel) => void): void;
     resolveQualifiedName(qualifiedName: string): FieldModel | FieldsetModel | null;
     fieldAdded(field: FieldModel | FieldsetModel): void;
+    readonly changeEventBehaviour: 'deps' | 'self';
 }
 export interface IFormFieldFactory {
     createField(child: FieldsetJson | FieldJson, options: {

package/lib/utils/Version.d.ts

@@ -0,0 +1,11 @@
+export declare class Version {
+    #private;
+    constructor(n: string);
+    get major(): number;
+    get minor(): number;
+    get subversion(): number;
+    completeMatch(v: Version): boolean;
+    lessThan(v: Version): boolean;
+    toString(): string;
+    valueOf(): string;
+}

package/lib/utils/Version.js

@@ -0,0 +1,60 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _Version_minor, _Version_major, _Version_subVersion, _Version_invalid;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Version = void 0;
+class Version {
+    constructor(n) {
+        _Version_minor.set(this, void 0);
+        _Version_major.set(this, void 0);
+        _Version_subVersion.set(this, void 0);
+        _Version_invalid.set(this, true);
+        const match = n.match(/([^.]+)\.([^.]+)(?:\.(.+))?/);
+        if (match) {
+            __classPrivateFieldSet(this, _Version_major, +match[1], "f");
+            __classPrivateFieldSet(this, _Version_minor, +match[2], "f");
+            __classPrivateFieldSet(this, _Version_subVersion, match[3] ? +match[3] : 0, "f");
+            if (isNaN(__classPrivateFieldGet(this, _Version_major, "f")) || isNaN(__classPrivateFieldGet(this, _Version_minor, "f")) || isNaN(__classPrivateFieldGet(this, _Version_subVersion, "f"))) {
+                throw new Error('Invalid version string ' + n);
+            }
+        }
+        else {
+            throw new Error('Invalid version string ' + n);
+        }
+    }
+    get major() {
+        return __classPrivateFieldGet(this, _Version_major, "f");
+    }
+    get minor() {
+        return __classPrivateFieldGet(this, _Version_minor, "f");
+    }
+    get subversion() {
+        return __classPrivateFieldGet(this, _Version_subVersion, "f");
+    }
+    completeMatch(v) {
+        return this.major === v.major &&
+            this.minor === v.minor &&
+            __classPrivateFieldGet(this, _Version_subVersion, "f") === v.subversion;
+    }
+    lessThan(v) {
+        return this.major < v.major || (this.major === v.major && (this.minor < v.minor)) || (this.major === v.major && this.minor === v.minor && __classPrivateFieldGet(this, _Version_subVersion, "f") < v.subversion);
+    }
+    toString() {
+        return `${this.major}.${this.minor}.${this.subversion}`;
+    }
+    valueOf() {
+        return this.toString();
+    }
+}
+exports.Version = Version;
+_Version_minor = new WeakMap(), _Version_major = new WeakMap(), _Version_subVersion = new WeakMap(), _Version_invalid = new WeakMap();

package/package.json

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