@aemforms/af-core 0.22.64 → 0.22.65

package/lib/DateField.d.ts

@@ -1,5 +1,9 @@
 import Field from './Field';
 declare class DateField extends Field {
+    private locale?;
+    private _dataFormat;
     protected _applyDefaults(): void;
+    get value(): any;
+    set value(value: any);
 }
 export default DateField;

package/lib/DateField.js

@@ -6,9 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("./Field"));
 const af_formatters_1 = require("@aemforms/af-formatters");
 class DateField extends Field_1.default {
+    constructor() {
+        super(...arguments);
+        this._dataFormat = 'yyyy-MM-dd';
+    }
     _applyDefaults() {
         super._applyDefaults();
-        const locale = new Intl.DateTimeFormat().resolvedOptions().locale;
+        this.locale = new Intl.DateTimeFormat().resolvedOptions().locale;
         if (!this._jsonModel.editFormat) {
             this._jsonModel.editFormat = 'short';
         }
@@ -16,10 +20,24 @@ class DateField extends Field_1.default {
             this._jsonModel.displayFormat = this._jsonModel.editFormat;
         }
         if (!this._jsonModel.placeholder) {
-            this._jsonModel.placeholder = (0, af_formatters_1.parseDateSkeleton)(this._jsonModel.editFormat, locale);
+            this._jsonModel.placeholder = (0, af_formatters_1.parseDateSkeleton)(this._jsonModel.editFormat, this.locale);
         }
         if (!this._jsonModel.description) {
-            this._jsonModel.description = `To enter today's date use ${(0, af_formatters_1.formatDate)(new Date(), locale, this._jsonModel.editFormat)}`;
+            this._jsonModel.description = `To enter today's date use ${(0, af_formatters_1.formatDate)(new Date(), this.locale, this._jsonModel.editFormat)}`;
+        }
+    }
+    get value() {
+        return super.value;
+    }
+    set value(value) {
+        if (typeof value === 'number') {
+            const coercedValue = (0, af_formatters_1.numberToDatetime)(value);
+            if (!isNaN(coercedValue)) {
+                super.value = (0, af_formatters_1.formatDate)(coercedValue, this.locale, this._dataFormat);
+            }
+        }
+        else {
+            super.value = value;
         }
     }
 }

package/lib/Form.d.ts

@@ -5,7 +5,9 @@ import SubmitMetaData from './SubmitMetaData';
 import EventQueue from './controller/EventQueue';
 import { Logger, LogLevel } from './controller/Logger';
 import RuleEngine from './rules/RuleEngine';
+import { FocusOption } from './types/Model';
 declare class Form extends Container<FormJson> implements FormModel {
+    #private;
     private _ruleEngine;
     private _eventQueue;
     private _fields;
@@ -21,7 +23,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     exportData(): any;
     resolveQualifiedName(qualifiedName: string): FieldModel | FieldsetModel | null;
     exportSubmitMetaData(): SubmitMetaData;
-    setFocus(field: BaseModel): void;
+    setFocus(field: BaseModel, focusOption: FocusOption): void;
     getState(): {
         description?: string | undefined;
     } & import("./types/Json").RulesJson & {

package/lib/Form.js

@@ -1,7 +1,13 @@
 "use strict";
+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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _Form_instances, _Form_getNavigableChildren, _Form_getFirstNavigableChild, _Form_setActiveFirstDeepChild, _Form_getNextItem, _Form_getPreviousItem;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Container_1 = __importDefault(require("./Container"));
 const FormMetaData_1 = __importDefault(require("./FormMetaData"));
@@ -12,11 +18,13 @@ 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 Model_1 = require("./types/Model");
 class Form extends Container_1.default {
     constructor(n, fieldFactory, _ruleEngine, _eventQueue = new EventQueue_1.default(), logLevel = 'off') {
         super(n, { fieldFactory: fieldFactory });
         this._ruleEngine = _ruleEngine;
         this._eventQueue = _eventQueue;
+        _Form_instances.add(this);
         this._fields = {};
         this._invalidFields = [];
         this.dataRefRegex = /("[^"]+?"|[^.]+?)(?:\.|$)/g;
@@ -73,14 +81,35 @@ class Form extends Container_1.default {
         submitMetaInstance = new SubmitMetaData_1.default(this.form.lang, captchaInfoObj);
         return submitMetaInstance;
     }
-    setFocus(field) {
-        const parent = field.parent;
+    setFocus(field, focusOption) {
+        const parent = (field.isContainer ? field : field.parent);
         const currentField = field;
-        if (parent != null && parent.activeChild != null) {
-            parent.activeChild = null;
+        if (focusOption && parent !== null) {
+            const navigableChidren = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNavigableChildren).call(this, parent.items);
+            let activeChild = parent.activeChild;
+            let currActiveChildIndex = activeChild !== null ? navigableChidren.indexOf(activeChild) : -1;
+            if (parent.activeChild === null) {
+                parent.activeChild = navigableChidren[0];
+                currActiveChildIndex = 0;
+                return;
+            }
+            if (focusOption === Model_1.FocusOption.NEXT_ITEM) {
+                activeChild = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNextItem).call(this, currActiveChildIndex, navigableChidren);
+            }
+            else if (focusOption === Model_1.FocusOption.PREVIOUS_ITEM) {
+                activeChild = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getPreviousItem).call(this, currActiveChildIndex, navigableChidren);
+            }
+            if (activeChild !== null) {
+                __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, activeChild);
+            }
         }
-        while (parent != null && parent.activeChild != currentField) {
-            parent.activeChild = currentField;
+        else {
+            if (parent != null && parent.activeChild != null) {
+                parent.activeChild = null;
+            }
+            while (parent != null && parent.activeChild != currentField) {
+                parent.activeChild = currentField;
+            }
         }
     }
     getState() {
@@ -203,4 +232,32 @@ class Form extends Container_1.default {
         return this._jsonModel.title || '';
     }
 }
+_Form_instances = new WeakSet(), _Form_getNavigableChildren = function _Form_getNavigableChildren(children) {
+    return children.filter(child => child.visible === true);
+}, _Form_getFirstNavigableChild = function _Form_getFirstNavigableChild(container) {
+    const navigableChidren = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNavigableChildren).call(this, container.items);
+    if (navigableChidren) {
+        return navigableChidren[0];
+    }
+    return null;
+}, _Form_setActiveFirstDeepChild = function _Form_setActiveFirstDeepChild(currentField) {
+    if (!currentField.isContainer) {
+        const parent = currentField.parent;
+        parent.activeChild = currentField;
+        return;
+    }
+    let currentActiveChild = currentField.activeChild;
+    currentActiveChild = (currentActiveChild === null) ? __classPrivateFieldGet(this, _Form_instances, "m", _Form_getFirstNavigableChild).call(this, currentField) : currentField.activeChild;
+    __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, currentActiveChild);
+}, _Form_getNextItem = function _Form_getNextItem(currIndex, navigableChidren) {
+    if (currIndex < (navigableChidren.length - 1)) {
+        return navigableChidren[currIndex + 1];
+    }
+    return null;
+}, _Form_getPreviousItem = function _Form_getPreviousItem(currIndex, navigableChidren) {
+    if (currIndex > 0) {
+        return navigableChidren[currIndex - 1];
+    }
+    return null;
+};
 exports.default = Form;

package/lib/Scriptable.js

@@ -15,7 +15,7 @@ class Scriptable extends BaseNode_1.BaseNode {
             const eString = rule || this.getRules()[eName];
             if (typeof eString === 'string' && eString.length > 0) {
                 try {
-                    this._rules[eName] = this.ruleEngine.compileRule(eString);
+                    this._rules[eName] = this.ruleEngine.compileRule(eString, this.lang);
                 }
                 catch (e) {
                     this.form.logger.error(`Unable to compile rule \`"${eName}" : "${eString}"\` Exception : ${e}`);
@@ -37,7 +37,7 @@ class Scriptable extends BaseNode_1.BaseNode {
             if (typeof eString !== 'undefined' && eString.length > 0) {
                 this._events[eName] = eString.map(x => {
                     try {
-                        return this.ruleEngine.compileRule(x);
+                        return this.ruleEngine.compileRule(x, this.lang);
                     }
                     catch (e) {
                         this.form.logger.error(`Unable to compile expression \`"${eName}" : "${eString}"\` Exception : ${e}`);
@@ -144,7 +144,7 @@ class Scriptable extends BaseNode_1.BaseNode {
             '$field': this.getRuleNode(),
             'field': this
         };
-        const node = this.ruleEngine.compileRule(expr);
+        const node = this.ruleEngine.compileRule(expr, this.lang);
         return this.ruleEngine.execute(node, this.getExpressionScope(), ruleContext);
     }
     executeAction(action) {

package/lib/rules/FunctionRuntime.js

@@ -247,9 +247,10 @@ class FunctionRuntimeImpl {
             setFocus: {
                 _func: (args, data, interpreter) => {
                     const element = args[0];
+                    const flag = args[1];
                     try {
-                        const field = interpreter.globals.form.getElement(element.$id);
-                        interpreter.globals.form.setFocus(field);
+                        const field = interpreter.globals.form.getElement(element === null || element === void 0 ? void 0 : element.$id) || interpreter.globals.field;
+                        interpreter.globals.form.setFocus(field, flag);
                     }
                     catch (e) {
                         interpreter.globals.form.logger.error('Invalid argument passed in setFocus. An element is expected');

package/lib/rules/RuleEngine.d.ts

@@ -1,11 +1,15 @@
 import { BaseModel } from '../types/index';
+import Formula from '@adobe/json-formula';
 declare class RuleEngine {
     private _context;
     private _globalNames;
-    private formulaEngine;
+    private readonly customFunctions;
     private debugInfo;
     constructor();
-    compileRule(rule: string): any;
+    compileRule(rule: string, locale?: string): {
+        formula: Formula;
+        ast: any;
+    };
     execute(node: any, data: any, globals: any, useValueOf?: boolean): any;
     trackDependency(subscriber: BaseModel): void;
 }

package/lib/rules/RuleEngine.js

@@ -5,6 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const json_formula_1 = __importDefault(require("@adobe/json-formula"));
 const FunctionRuntime_1 = require("./FunctionRuntime");
+const CoercionUtils_1 = require("../utils/CoercionUtils");
+function getStringToNumberFn(locale) {
+    if (locale == null) {
+        const localeOptions = new Intl.DateTimeFormat().resolvedOptions();
+        locale = localeOptions.locale;
+    }
+    return (str) => (0, CoercionUtils_1.stringToNumber)(str, locale);
+}
 class RuleEngine {
     constructor() {
         this._globalNames = [
@@ -13,19 +21,20 @@ class RuleEngine {
             '$event'
         ];
         this.debugInfo = [];
-        const customFunctions = FunctionRuntime_1.FunctionRuntime.getFunctions();
-        this.formulaEngine = new json_formula_1.default(customFunctions, undefined, this.debugInfo);
+        this.customFunctions = FunctionRuntime_1.FunctionRuntime.getFunctions();
     }
-    compileRule(rule) {
-        return this.formulaEngine.compile(rule, this._globalNames);
+    compileRule(rule, locale) {
+        const formula = new json_formula_1.default(this.customFunctions, getStringToNumberFn(locale), this.debugInfo);
+        return { formula, ast: formula.compile(rule, this._globalNames) };
     }
     execute(node, data, globals, useValueOf = false) {
         var _a, _b, _c, _d, _e, _f;
+        const { formula, ast } = node;
         const oldContext = this._context;
         this._context = globals;
         let res = undefined;
         try {
-            res = this.formulaEngine.run(node, data, 'en-US', globals);
+            res = formula.run(ast, data, 'en-US', globals);
         }
         catch (err) {
             (_c = (_b = (_a = this._context) === null || _a === void 0 ? void 0 : _a.form) === null || _b === void 0 ? void 0 : _b.logger) === null || _c === void 0 ? void 0 : _c.error(err);

package/lib/types/Model.d.ts

@@ -133,4 +133,8 @@ export declare class ValidationError implements IValidationError {
     errorMessages: Array<string>;
     constructor(fieldName?: string, errorMessages?: Array<any>);
 }
+export declare enum FocusOption {
+    NEXT_ITEM = "nextItem",
+    PREVIOUS_ITEM = "previousItem"
+}
 export {};

package/lib/types/Model.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValidationError = void 0;
+exports.FocusOption = exports.ValidationError = void 0;
 class ValidationError {
     constructor(fieldName = '', errorMessages = []) {
         this.errorMessages = errorMessages;
@@ -8,3 +8,8 @@ class ValidationError {
     }
 }
 exports.ValidationError = ValidationError;
+var FocusOption;
+(function (FocusOption) {
+    FocusOption["NEXT_ITEM"] = "nextItem";
+    FocusOption["PREVIOUS_ITEM"] = "previousItem";
+})(FocusOption = exports.FocusOption || (exports.FocusOption = {}));

package/lib/utils/CoercionUtils.d.ts

@@ -0,0 +1 @@
+export declare function stringToNumber(str: string, language: string): number;

package/lib/utils/CoercionUtils.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringToNumber = void 0;
+const af_formatters_1 = require("@aemforms/af-formatters");
+function stringToNumber(str, language) {
+    if (str === null) {
+        return 0;
+    }
+    const n = +str;
+    if (!isNaN(n)) {
+        return n;
+    }
+    if (language) {
+        const date = (0, af_formatters_1.parseDefaultDate)(str, language, true);
+        if (date !== str) {
+            return (0, af_formatters_1.datetimeToNumber)(date);
+        }
+    }
+    return 0;
+}
+exports.stringToNumber = stringToNumber;

package/package.json

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