@aemforms/af-core 0.22.51 → 0.22.53

package/lib/Captcha.d.ts

@@ -0,0 +1,5 @@
+import Field from './Field';
+declare class Captcha extends Field {
+    getDataNode(): undefined;
+}
+export default Captcha;

package/lib/Captcha.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Field_1 = __importDefault(require("./Field"));
+class Captcha extends Field_1.default {
+    getDataNode() {
+        return undefined;
+    }
+}
+exports.default = Captcha;

package/lib/Form.d.ts

@@ -1,6 +1,7 @@
 import Container from './Container';
 import { Action, BaseModel, FieldModel, FieldsetModel, FormJson, FormModel, IFormFieldFactory } from './types/index';
 import FormMetaData from './FormMetaData';
+import SubmitMetaData from './SubmitMetaData';
 import EventQueue from './controller/EventQueue';
 import { Logger, LogLevel } from './controller/Logger';
 import RuleEngine from './rules/RuleEngine';
@@ -18,6 +19,7 @@ declare class Form extends Container<FormJson> implements FormModel {
     get action(): string | undefined;
     importData(dataModel: any): void;
     exportData(): any;
+    exportSubmitMetaData(): SubmitMetaData;
     setFocus(field: BaseModel): void;
     getState(): {
         description?: string | undefined;

package/lib/Form.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Container_1 = __importDefault(require("./Container"));
 const FormMetaData_1 = __importDefault(require("./FormMetaData"));
+const SubmitMetaData_1 = __importDefault(require("./SubmitMetaData"));
 const EventQueue_1 = __importDefault(require("./controller/EventQueue"));
 const Logger_1 = require("./controller/Logger");
 const FormUtils_1 = require("./utils/FormUtils");
@@ -46,6 +47,23 @@ class Form extends Container_1.default {
         var _a;
         return (_a = this.getDataNode()) === null || _a === void 0 ? void 0 : _a.$value;
     }
+    exportSubmitMetaData() {
+        let submitMetaInstance = null;
+        const captchaInfoObj = {};
+        function addCaptchaField(fieldName, fieldValue) {
+            if (captchaInfoObj[fieldName]) {
+                return;
+            }
+            captchaInfoObj[fieldName] = fieldValue;
+        }
+        this.visit(field => {
+            if (field.fieldType === 'captcha') {
+                addCaptchaField(field.qualifiedName, field.value);
+            }
+        });
+        submitMetaInstance = new SubmitMetaData_1.default(this.form.lang, captchaInfoObj);
+        return submitMetaInstance;
+    }
     setFocus(field) {
         const parent = field.parent;
         const currentField = field;

package/lib/SubmitMetaData.d.ts

@@ -0,0 +1,7 @@
+import { SubmitMetaDataModel } from './types/index';
+declare class SubmitMetaData implements SubmitMetaDataModel {
+    lang: string;
+    captchaInfo: Record<string, any>;
+    constructor(lang: string | undefined, captchaInfo: Record<string, any>);
+}
+export default SubmitMetaData;

package/lib/SubmitMetaData.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class SubmitMetaData {
+    constructor(lang = '', captchaInfo) {
+        this.lang = lang;
+        this.captchaInfo = captchaInfo;
+    }
+}
+exports.default = SubmitMetaData;

package/lib/index.d.ts

@@ -14,8 +14,9 @@ import { Fieldset } from './Fieldset';
 import { FileObject } from './FileObject';
 import FileUpload from './FileUpload';
 import FormMetaData from './FormMetaData';
+import SubmitMetaData from './SubmitMetaData';
 import Node from './Node';
 import Scriptable from './Scriptable';
 import Form from './Form';
 import { FunctionRuntime, request } from './rules/FunctionRuntime';
-export { Form, BaseNode, Checkbox, CheckboxGroup, Container, Field, Fieldset, FileObject, FileUpload, FormMetaData, Node, Scriptable, getFileSizeInBytes, extractFileInfo, FunctionRuntime, request, isEmpty };
+export { Form, BaseNode, Checkbox, CheckboxGroup, Container, Field, Fieldset, FileObject, FileUpload, FormMetaData, Node, Scriptable, getFileSizeInBytes, extractFileInfo, FunctionRuntime, request, isEmpty, SubmitMetaData };

package/lib/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmpty = exports.request = exports.FunctionRuntime = exports.extractFileInfo = exports.getFileSizeInBytes = exports.Scriptable = exports.Node = exports.FormMetaData = exports.FileUpload = exports.FileObject = exports.Fieldset = exports.Field = exports.Container = exports.CheckboxGroup = exports.Checkbox = exports.BaseNode = exports.Form = void 0;
+exports.SubmitMetaData = exports.isEmpty = exports.request = exports.FunctionRuntime = exports.extractFileInfo = exports.getFileSizeInBytes = exports.Scriptable = exports.Node = exports.FormMetaData = exports.FileUpload = exports.FileObject = exports.Fieldset = exports.Field = exports.Container = exports.CheckboxGroup = exports.Checkbox = exports.BaseNode = exports.Form = void 0;
 __exportStar(require("./FormInstance"), exports);
 __exportStar(require("./types/index"), exports);
 __exportStar(require("./controller/Events"), exports);
@@ -46,6 +46,8 @@ const FileUpload_1 = __importDefault(require("./FileUpload"));
 exports.FileUpload = FileUpload_1.default;
 const FormMetaData_1 = __importDefault(require("./FormMetaData"));
 exports.FormMetaData = FormMetaData_1.default;
+const SubmitMetaData_1 = __importDefault(require("./SubmitMetaData"));
+exports.SubmitMetaData = SubmitMetaData_1.default;
 const Node_1 = __importDefault(require("./Node"));
 exports.Node = Node_1.default;
 const Scriptable_1 = __importDefault(require("./Scriptable"));

package/lib/rules/FunctionRuntime.js

@@ -130,7 +130,7 @@ const submit = (context, success, error, submitAs = 'multipart/form-data', input
     }
     const attachments = (0, FormUtils_1.getAttachments)(context.form, true);
     let submitContentType = submitAs;
-    const submitDataAndMetaData = { 'data': data, 'submitMetadata': { 'lang': context.form.lang } };
+    const submitDataAndMetaData = { 'data': data, 'submitMetadata': context.form.exportSubmitMetaData() };
     let formData = submitDataAndMetaData;
     if (Object.keys(attachments).length > 0 || submitAs === 'multipart/form-data') {
         formData = multipartFormData(submitDataAndMetaData, attachments);

package/lib/types/Model.d.ts

@@ -83,6 +83,10 @@ export interface FormMetaDataModel {
     readonly version: string;
     readonly grammar: string;
 }
+export interface SubmitMetaDataModel {
+    lang: string;
+    captchaInfo: Record<string, any>;
+}
 export interface ContainerModel extends BaseModel, ScriptableField {
     items: Array<FieldsetModel | FieldModel>;
     parent: ContainerModel;

package/lib/utils/FormCreationUtils.js

@@ -13,6 +13,7 @@ const CheckboxGroup_1 = __importDefault(require("../CheckboxGroup"));
 const DateField_1 = __importDefault(require("../DateField"));
 const Field_1 = __importDefault(require("../Field"));
 const EmailInput_1 = __importDefault(require("../EmailInput"));
+const Captcha_1 = __importDefault(require("../Captcha"));
 const alternateFieldTypeMapping = {
     'text': 'text-input',
     'number': 'number-input',
@@ -61,6 +62,9 @@ class FormFieldFactoryImpl {
             else if ((0, JsonUtils_1.isDateField)(child)) {
                 retVal = new DateField_1.default(child, options);
             }
+            else if ((0, JsonUtils_1.isCaptcha)(child)) {
+                retVal = new Captcha_1.default(child, options);
+            }
             else {
                 retVal = new Field_1.default(child, options);
             }

package/lib/utils/JsonUtils.d.ts

@@ -6,6 +6,7 @@ export declare const isCheckbox: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isCheckboxGroup: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isEmailInput: (item: FieldsetJson | FieldJson) => boolean;
 export declare const isDateField: (item: FieldsetJson | FieldJson) => boolean;
+export declare const isCaptcha: (item: FieldsetJson | FieldJson) => boolean;
 export declare function deepClone(obj: any, idGenerator?: () => string): any;
 export declare function checkIfKeyAdded(currentObj: any, prevObj: any, objKey: string): boolean;
 export declare const jsonString: (obj: any) => string;

package/lib/utils/JsonUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRepeatable = exports.jsonString = exports.checkIfKeyAdded = exports.deepClone = exports.isDateField = exports.isEmailInput = exports.isCheckboxGroup = exports.isCheckbox = exports.checkIfConstraintsArePresent = exports.isFile = exports.getProperty = void 0;
+exports.isRepeatable = exports.jsonString = exports.checkIfKeyAdded = exports.deepClone = exports.isCaptcha = exports.isDateField = exports.isEmailInput = exports.isCheckboxGroup = exports.isCheckbox = exports.checkIfConstraintsArePresent = exports.isFile = exports.getProperty = void 0;
 const index_1 = require("../types/index");
 const SchemaUtils_1 = require("./SchemaUtils");
 const getProperty = (data, key, def) => {
@@ -46,6 +46,11 @@ const isDateField = function (item) {
     return (fieldType === 'text-input' && (item === null || item === void 0 ? void 0 : item.format) === 'date') || fieldType === 'date-input';
 };
 exports.isDateField = isDateField;
+const isCaptcha = function (item) {
+    const fieldType = (item === null || item === void 0 ? void 0 : item.fieldType) || (0, SchemaUtils_1.defaultFieldTypes)(item);
+    return fieldType === 'captcha';
+};
+exports.isCaptcha = isCaptcha;
 function deepClone(obj, idGenerator) {
     let result;
     if (obj instanceof Array) {

package/package.json

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