@aemforms/af-core 0.22.87 → 0.22.89

package/esm/afb-runtime.js

@@ -81,6 +81,11 @@ var FocusOption;
     FocusOption["NEXT_ITEM"] = "nextItem";
     FocusOption["PREVIOUS_ITEM"] = "previousItem";
 })(FocusOption || (FocusOption = {}));
+var CaptchaDisplayMode;
+(function (CaptchaDisplayMode) {
+    CaptchaDisplayMode["INVISIBLE"] = "invisible";
+    CaptchaDisplayMode["VISIBLE"] = "visible";
+})(CaptchaDisplayMode || (CaptchaDisplayMode = {}));
 
 const objToMap = (o) => new Map(Object.entries(o));
 const stringViewTypes = objToMap({ 'date': 'date-input', 'data-url': 'file-input', 'binary': 'file-input' });
@@ -592,6 +597,9 @@ class FileObject {
     get type() {
         return this.mediaType;
     }
+    set type(type) {
+        this.mediaType = type;
+    }
     toJSON() {
         return {
             'name': this.name,
@@ -2699,6 +2707,21 @@ class FunctionRuntimeImpl {
                                 dispatchEvent: (target, eventName, payload) => {
                                     const args = [target, eventName, payload];
                                     return FunctionRuntimeImpl.getInstance().getFunctions().dispatchEvent._func.call(undefined, args, data, interpreter);
+                                },
+                                getFiles: (qualifiedName) => {
+                                    const filesMap = {};
+                                    if (!qualifiedName) {
+                                        interpreter.globals.form.visit(function callback(f) {
+                                            if (f.fieldType === 'file-input' && f.value) {
+                                                filesMap[f.qualifiedName] = f.serialize();
+                                            }
+                                        });
+                                    }
+                                    const field = interpreter.globals.form.resolveQualifiedName(qualifiedName);
+                                    if (field?.fieldType === 'file-input' && field?.value) {
+                                        filesMap[qualifiedName] = field.serialize();
+                                    }
+                                    return filesMap;
                                 }
                             }
                         };
@@ -2819,8 +2842,8 @@ class FunctionRuntimeImpl {
                         validate_form = args.length > 4 ? valueOf(args[4]) : true;
                     }
                     const form = interpreter.globals.form;
-                    if (form.captcha && form.captcha.properties['fd:captcha'].config.version === 'enterprise'
-                        && form.captcha.properties['fd:captcha'].config.keyType === 'score') {
+                    if (form.captcha && (form.captcha.captchaDisplayMode === CaptchaDisplayMode.INVISIBLE ||
+                        (form.captcha.properties['fd:captcha']?.config?.version === 'enterprise' && form.captcha.properties['fd:captcha']?.config?.keyType === 'score'))) {
                         if (typeof interpreter.runtime.functionTable.fetchCaptchaToken?._func !== 'function') {
                             interpreter.globals.form.logger.error('fetchCaptchaToken is not defined');
                             interpreter.globals.form.dispatch(new SubmitError({ type: 'FetchCaptchaTokenNotDefined' }));
@@ -4307,7 +4330,7 @@ class FileUpload extends Field {
         }
         return dataNodeValue;
     }
-    async _serialize() {
+    async serialize() {
         const val = this._jsonModel.value;
         if (val === undefined) {
             return null;
@@ -4474,12 +4497,30 @@ class EmailInput extends Field {
 }
 
 class Captcha extends Field {
+    _captchaDisplayMode;
+    _captchaProvider;
+    _captchaSiteKey;
+    constructor(params, _options) {
+        super(params, _options);
+        this._captchaDisplayMode = params.captchaDisplayMode;
+        this._captchaProvider = params.captchaProvider;
+        this._captchaSiteKey = params.siteKey;
+    }
     getDataNode() {
         return undefined;
     }
     custom_setProperty(action) {
         this.applyUpdates(action.payload);
     }
+    get captchaDisplayMode() {
+        return this._captchaDisplayMode;
+    }
+    get captchaProvider() {
+        return this._captchaProvider;
+    }
+    get captchaSiteKey() {
+        return this._captchaSiteKey;
+    }
 }
 
 class Button extends Field {

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

@@ -1,7 +1,18 @@
 import Field from './Field';
-import { Action } from './types';
-declare class Captcha extends Field {
+import { Action, CaptchaDisplayMode, CaptchaJson, CaptchaModel, ContainerModel, FormModel } from './types';
+declare class Captcha extends Field implements CaptchaModel {
+    private _captchaDisplayMode;
+    private _captchaProvider;
+    private _captchaSiteKey;
+    constructor(params: CaptchaJson, _options: {
+        form: FormModel;
+        parent: ContainerModel;
+        mode?: 'create' | 'restore';
+    });
     getDataNode(): undefined;
     custom_setProperty(action: Action): void;
+    get captchaDisplayMode(): CaptchaDisplayMode | undefined;
+    get captchaProvider(): string | undefined;
+    get captchaSiteKey(): string | undefined;
 }
 export default Captcha;

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

@@ -6,6 +6,7 @@ export declare class FileObject implements IFileObject {
     size: number;
     constructor(init?: Partial<FileObject>);
     get type(): string;
+    set type(type: string);
     toJSON(): {
         name: string;
         size: number;

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

@@ -21,7 +21,7 @@ declare class FileUpload extends Field implements FieldModel {
     protected _applyUpdates(propNames: string[], updates: any): any;
     protected getInternalType(): "file" | "file[]";
     protected getDataNodeValue(typedValue: any): any;
-    private _serialize;
+    serialize(): Promise<unknown[] | null>;
     importData(dataModel: DataGroup): void;
 }
 export default FileUpload;

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

@@ -1,3 +1,4 @@
+import { CaptchaDisplayMode } from './Model';
 export type Items<T> = {
     [key: string]: T;
 };
@@ -100,6 +101,11 @@ export type FieldJson = BaseJson & TranslationFieldJson & {
     emptyValue?: 'null' | 'undefined' | '';
     checked?: boolean;
 };
+export type CaptchaJson = FieldJson & {
+    captchaDisplayMode?: CaptchaDisplayMode | undefined;
+    captchaProvider?: string | undefined;
+    siteKey?: string | undefined;
+};
 export type ContainerJson = BaseJson & {
     items: Array<FieldJson | ContainerJson>;
     initialItems?: number;

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

@@ -83,6 +83,11 @@ export interface FieldModel extends BaseModel, ScriptableField, WithState<FieldJ
     readonly displayValueExpression?: string;
     readonly editValue?: string;
 }
+export interface CaptchaModel extends FieldModel {
+    captchaDisplayMode: CaptchaDisplayMode | undefined;
+    captchaProvider: string | undefined;
+    captchaSiteKey: string | undefined;
+}
 export interface FormMetaDataModel {
     readonly version?: string;
     readonly grammar: string;
@@ -144,4 +149,8 @@ export declare enum FocusOption {
     NEXT_ITEM = "nextItem",
     PREVIOUS_ITEM = "previousItem"
 }
+export declare enum CaptchaDisplayMode {
+    INVISIBLE = "invisible",
+    VISIBLE = "visible"
+}
 export {};

package/lib/Captcha.d.ts

@@ -1,7 +1,18 @@
 import Field from './Field';
-import { Action } from './types';
-declare class Captcha extends Field {
+import { Action, CaptchaDisplayMode, CaptchaJson, CaptchaModel, ContainerModel, FormModel } from './types';
+declare class Captcha extends Field implements CaptchaModel {
+    private _captchaDisplayMode;
+    private _captchaProvider;
+    private _captchaSiteKey;
+    constructor(params: CaptchaJson, _options: {
+        form: FormModel;
+        parent: ContainerModel;
+        mode?: 'create' | 'restore';
+    });
     getDataNode(): undefined;
     custom_setProperty(action: Action): void;
+    get captchaDisplayMode(): CaptchaDisplayMode | undefined;
+    get captchaProvider(): string | undefined;
+    get captchaSiteKey(): string | undefined;
 }
 export default Captcha;

package/lib/Captcha.js

@@ -5,11 +5,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("./Field"));
 class Captcha extends Field_1.default {
+    constructor(params, _options) {
+        super(params, _options);
+        this._captchaDisplayMode = params.captchaDisplayMode;
+        this._captchaProvider = params.captchaProvider;
+        this._captchaSiteKey = params.siteKey;
+    }
     getDataNode() {
         return undefined;
     }
     custom_setProperty(action) {
         this.applyUpdates(action.payload);
     }
+    get captchaDisplayMode() {
+        return this._captchaDisplayMode;
+    }
+    get captchaProvider() {
+        return this._captchaProvider;
+    }
+    get captchaSiteKey() {
+        return this._captchaSiteKey;
+    }
 }
 exports.default = Captcha;

package/lib/FileObject.d.ts

@@ -6,6 +6,7 @@ export declare class FileObject implements IFileObject {
     size: number;
     constructor(init?: Partial<FileObject>);
     get type(): string;
+    set type(type: string);
     toJSON(): {
         name: string;
         size: number;

package/lib/FileObject.js

@@ -11,6 +11,9 @@ class FileObject {
     get type() {
         return this.mediaType;
     }
+    set type(type) {
+        this.mediaType = type;
+    }
     toJSON() {
         return {
             'name': this.name,

package/lib/FileUpload.d.ts

@@ -21,7 +21,7 @@ declare class FileUpload extends Field implements FieldModel {
     protected _applyUpdates(propNames: string[], updates: any): any;
     protected getInternalType(): "file" | "file[]";
     protected getDataNodeValue(typedValue: any): any;
-    private _serialize;
+    serialize(): Promise<unknown[] | null>;
     importData(dataModel: DataGroup): void;
 }
 export default FileUpload;

package/lib/FileUpload.js

@@ -93,7 +93,7 @@ class FileUpload extends Field_1.default {
         }
         return dataNodeValue;
     }
-    _serialize() {
+    serialize() {
         return __awaiter(this, void 0, void 0, function* () {
             const val = this._jsonModel.value;
             if (val === undefined) {

package/lib/rules/FunctionRuntime.js

@@ -15,6 +15,7 @@ const Fetch_1 = require("../utils/Fetch");
 const FileObject_1 = require("../FileObject");
 const FormUtils_1 = require("../utils/FormUtils");
 const JsonUtils_1 = require("../utils/JsonUtils");
+const types_1 = require("../types");
 const getCustomEventName = (name) => {
     const eName = name;
     if (eName.length > 0 && eName.startsWith('custom:')) {
@@ -238,6 +239,21 @@ class FunctionRuntimeImpl {
                                 dispatchEvent: (target, eventName, payload) => {
                                     const args = [target, eventName, payload];
                                     return FunctionRuntimeImpl.getInstance().getFunctions().dispatchEvent._func.call(undefined, args, data, interpreter);
+                                },
+                                getFiles: (qualifiedName) => {
+                                    const filesMap = {};
+                                    if (!qualifiedName) {
+                                        interpreter.globals.form.visit(function callback(f) {
+                                            if (f.fieldType === 'file-input' && f.value) {
+                                                filesMap[f.qualifiedName] = f.serialize();
+                                            }
+                                        });
+                                    }
+                                    const field = interpreter.globals.form.resolveQualifiedName(qualifiedName);
+                                    if ((field === null || field === void 0 ? void 0 : field.fieldType) === 'file-input' && (field === null || field === void 0 ? void 0 : field.value)) {
+                                        filesMap[qualifiedName] = field.serialize();
+                                    }
+                                    return filesMap;
                                 }
                             }
                         };
@@ -339,7 +355,7 @@ class FunctionRuntimeImpl {
             },
             submitForm: {
                 _func: (args, data, interpreter) => __awaiter(this, void 0, void 0, function* () {
-                    var _a;
+                    var _a, _b, _c, _d, _e;
                     let success = null;
                     let error = null;
                     let submit_data;
@@ -359,9 +375,9 @@ class FunctionRuntimeImpl {
                         validate_form = args.length > 4 ? valueOf(args[4]) : true;
                     }
                     const form = interpreter.globals.form;
-                    if (form.captcha && form.captcha.properties['fd:captcha'].config.version === 'enterprise'
-                        && form.captcha.properties['fd:captcha'].config.keyType === 'score') {
-                        if (typeof ((_a = interpreter.runtime.functionTable.fetchCaptchaToken) === null || _a === void 0 ? void 0 : _a._func) !== 'function') {
+                    if (form.captcha && (form.captcha.captchaDisplayMode === types_1.CaptchaDisplayMode.INVISIBLE ||
+                        (((_b = (_a = form.captcha.properties['fd:captcha']) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.version) === 'enterprise' && ((_d = (_c = form.captcha.properties['fd:captcha']) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.keyType) === 'score'))) {
+                        if (typeof ((_e = interpreter.runtime.functionTable.fetchCaptchaToken) === null || _e === void 0 ? void 0 : _e._func) !== 'function') {
                             interpreter.globals.form.logger.error('fetchCaptchaToken is not defined');
                             interpreter.globals.form.dispatch(new Events_1.SubmitError({ type: 'FetchCaptchaTokenNotDefined' }));
                             return {};

package/lib/types/Json.d.ts

@@ -1,3 +1,4 @@
+import { CaptchaDisplayMode } from './Model';
 export declare type Items<T> = {
     [key: string]: T;
 };
@@ -100,6 +101,11 @@ export declare type FieldJson = BaseJson & TranslationFieldJson & {
     emptyValue?: 'null' | 'undefined' | '';
     checked?: boolean;
 };
+export declare type CaptchaJson = FieldJson & {
+    captchaDisplayMode?: CaptchaDisplayMode | undefined;
+    captchaProvider?: string | undefined;
+    siteKey?: string | undefined;
+};
 export declare type ContainerJson = BaseJson & {
     items: Array<FieldJson | ContainerJson>;
     initialItems?: number;

package/lib/types/Model.d.ts

@@ -83,6 +83,11 @@ export interface FieldModel extends BaseModel, ScriptableField, WithState<FieldJ
     readonly displayValueExpression?: string;
     readonly editValue?: string;
 }
+export interface CaptchaModel extends FieldModel {
+    captchaDisplayMode: CaptchaDisplayMode | undefined;
+    captchaProvider: string | undefined;
+    captchaSiteKey: string | undefined;
+}
 export interface FormMetaDataModel {
     readonly version?: string;
     readonly grammar: string;
@@ -144,4 +149,8 @@ export declare enum FocusOption {
     NEXT_ITEM = "nextItem",
     PREVIOUS_ITEM = "previousItem"
 }
+export declare enum CaptchaDisplayMode {
+    INVISIBLE = "invisible",
+    VISIBLE = "visible"
+}
 export {};

package/lib/types/Model.js

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

package/package.json

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