@aemforms/af-core 0.22.17 → 0.22.18

package/lib/Scriptable.js

@@ -18,12 +18,12 @@ class Scriptable extends BaseNode_1.BaseNode {
         this._events = {};
         this._rules = {};
     }
-    get rules() {
-        return this._jsonModel.rules || {};
+    getRules() {
+        return typeof this._jsonModel.rules !== 'object' ? {} : this._jsonModel.rules;
     }
     getCompiledRule(eName, rule) {
         if (!(eName in this._rules)) {
-            const eString = rule || this.rules[eName];
+            const eString = rule || this.getRules()[eName];
             if (typeof eString === 'string' && eString.length > 0) {
                 try {
                     this._rules[eName] = this.ruleEngine.compileRule(eString);
@@ -76,7 +76,7 @@ class Scriptable extends BaseNode_1.BaseNode {
         });
     }
     executeAllRules(context) {
-        const entries = Object.entries(this.rules);
+        const entries = Object.entries(this.getRules());
         if (entries.length > 0) {
             const scope = this.getExpressionScope();
             entries.forEach(([prop, rule]) => {

package/lib/types/Json.d.ts

@@ -82,6 +82,9 @@ export declare type BaseJson = TranslationBaseJson & RulesJson & ConstraintsJson
     properties?: {
         [key: string]: any;
     };
+    screenReaderText?: string;
+    tooltip?: string;
+    altText?: string;
 };
 /** Type for `form field properties`which can be translated based on `adaptive form specification` */
 declare type TranslationFieldJson = {

package/lib/types/Model.d.ts

@@ -39,14 +39,15 @@ interface WithState<T> {
      */
     getState: () => State<T>;
 }
-/** Generic type for a form object state */
-export declare type State<T> = T extends ContainerJson ? T & {
-    id: string;
-    items: Array<State<FieldJson | ContainerJson>>;
-} : T & {
+declare type stateProps = {
     id: string;
+    index: number;
     ':type': string;
 };
+/** Generic type for a form object state */
+export declare type State<T> = stateProps & (T extends ContainerJson ? T & {
+    items: Array<State<FieldJson | ContainerJson>>;
+} : T);
 /**
  * @private
  */
@@ -344,7 +345,7 @@ export interface IFileObject {
     /**
      * Media type of the file data
      */
-    type: string;
+    mediaType: string;
     /**
      * Data of the file attachment. It can be uri or any file interface specific to channel (in web, it is file object).
      */

package/lib/utils/FormUtils.js

@@ -150,7 +150,7 @@ const extractFileInfo = (file) => {
             // case: file object
             retVal = {
                 name: file.name,
-                type: file.type,
+                mediaType: file.type,
                 size: file.size,
                 data: file
             };
@@ -162,7 +162,7 @@ const extractFileInfo = (file) => {
                 const { blob, name } = result;
                 retVal = {
                     name: name,
-                    type: blob.type,
+                    mediaType: blob.type,
                     size: blob.size,
                     data: blob
                 };
@@ -174,6 +174,9 @@ const extractFileInfo = (file) => {
             try {
                 jFile = JSON.parse(file);
                 retVal = jFile;
+                if (!retVal.mediaType) {
+                    retVal.mediaType = retVal.type;
+                }
             }
             catch (ex) {
                 // do nothing
@@ -185,7 +188,7 @@ const extractFileInfo = (file) => {
                     const blob = result.blob;
                     retVal = {
                         name: jFile === null || jFile === void 0 ? void 0 : jFile.name,
-                        type: jFile === null || jFile === void 0 ? void 0 : jFile.type,
+                        mediaType: (jFile === null || jFile === void 0 ? void 0 : jFile.type) || (jFile === null || jFile === void 0 ? void 0 : jFile.mediaType),
                         size: blob.size,
                         data: blob
                     };
@@ -196,7 +199,7 @@ const extractFileInfo = (file) => {
                 const fileName = jFile.split('/').pop();
                 retVal = {
                     name: fileName,
-                    type: 'application/octet-stream',
+                    mediaType: 'application/octet-stream',
                     size: 0,
                     data: jFile
                 };
@@ -205,7 +208,7 @@ const extractFileInfo = (file) => {
                 // todo: just added for ease of integration for the view layer
                 retVal = {
                     name: jFile === null || jFile === void 0 ? void 0 : jFile.name,
-                    type: jFile === null || jFile === void 0 ? void 0 : jFile.type,
+                    mediaType: (jFile === null || jFile === void 0 ? void 0 : jFile.type) || (jFile === null || jFile === void 0 ? void 0 : jFile.mediaType),
                     size: jFile === null || jFile === void 0 ? void 0 : jFile.size,
                     data: jFile === null || jFile === void 0 ? void 0 : jFile.data
                 };

package/lib/utils/ValidationUtils.js

@@ -49,6 +49,11 @@ exports.isDataUrl = isDataUrl;
  * @returns {@link ValidationResult | Validation result}
  */
 const checkNumber = (inputVal) => {
+    if (inputVal === '' || inputVal == null) {
+        return {
+            value: '', valid: true
+        };
+    }
     let value = parseFloat(inputVal);
     const valid = !isNaN(value);
     if (!valid) {
@@ -58,7 +63,16 @@ const checkNumber = (inputVal) => {
         value, valid
     };
 };
+/**
+ *
+ * @param inputVal
+ */
 const checkInteger = (inputVal) => {
+    if (inputVal == '' || inputVal == null) {
+        return {
+            value: '', valid: true
+        };
+    }
     let value = parseFloat(inputVal);
     const valid = !isNaN(value) && Math.round(value) === value;
     if (!valid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.17",
+  "version": "0.22.18",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "^0.1.44",
-    "@aemforms/af-formatters": "^0.22.17"
+    "@aemforms/af-formatters": "^0.22.18"
   },
   "devDependencies": {
     "@types/jest": "^27.5.1",