@aemforms/af-core 0.22.150 → 0.22.152

package/esm/afb-runtime.js

@@ -26,7 +26,8 @@ const ConstraintType = Object.freeze({
     MAX_ITEMS_MISMATCH: 'maxItemsMismatch',
     EXPRESSION_MISMATCH: 'expressionMismatch',
     EXCLUSIVE_MAXIMUM_MISMATCH: 'exclusiveMaximumMismatch',
-    EXCLUSIVE_MINIMUM_MISMATCH: 'exclusiveMinimumMismatch'
+    EXCLUSIVE_MINIMUM_MISMATCH: 'exclusiveMinimumMismatch',
+    ENUM_MISMATCH: 'enumMismatch'
 });
 const constraintKeys = Object.freeze({
     pattern: ConstraintType.PATTERN_MISMATCH,
@@ -45,7 +46,8 @@ const constraintKeys = Object.freeze({
     maxItems: ConstraintType.MAX_ITEMS_MISMATCH,
     validationExpression: ConstraintType.EXPRESSION_MISMATCH,
     exclusiveMinimum: ConstraintType.EXCLUSIVE_MINIMUM_MISMATCH,
-    exclusiveMaximum: ConstraintType.EXCLUSIVE_MAXIMUM_MISMATCH
+    exclusiveMaximum: ConstraintType.EXCLUSIVE_MAXIMUM_MISMATCH,
+    enum: ConstraintType.ENUM_MISMATCH
 });
 const defaultConstraintTypeMessages = Object.freeze({
     [ConstraintType.PATTERN_MISMATCH]: 'Please match the format requested.',
@@ -64,7 +66,8 @@ const defaultConstraintTypeMessages = Object.freeze({
     [ConstraintType.MAX_ITEMS_MISMATCH]: 'Specify a number of items equal to or less than ${0}.',
     [ConstraintType.EXPRESSION_MISMATCH]: 'Please enter a valid value.',
     [ConstraintType.EXCLUSIVE_MINIMUM_MISMATCH]: 'Value must be greater than ${0}.',
-    [ConstraintType.EXCLUSIVE_MAXIMUM_MISMATCH]: 'Value must be less than ${0}.'
+    [ConstraintType.EXCLUSIVE_MAXIMUM_MISMATCH]: 'Value must be less than ${0}.',
+    [ConstraintType.ENUM_MISMATCH]: 'Please select a value from the allowed options.'
 });
 let customConstraintTypeMessages = {};
 const getConstraintTypeMessages = () => {
@@ -358,6 +361,22 @@ class DataValue {
     $bindToField(field) {
         if (this.$_fields.indexOf(field) === -1) {
             this.$_fields.push(field);
+            this._checkForTypeConflicts(field);
+        }
+    }
+    _checkForTypeConflicts(newField) {
+        if (this.$_fields.length <= 1) {
+            return;
+        }
+        const newFieldType = newField.type;
+        const conflictingFields = this.$_fields.filter(existingField => existingField &&
+            existingField !== newField &&
+            existingField.type !== newFieldType);
+        if (conflictingFields.length > 0) {
+            const conflictDetails = conflictingFields.map(field => `Field "${field.id}" (${field.type})`).join(', ');
+            console.error('Type conflict detected: Multiple fields with same dataRef have different types. ' +
+                `New field '${newField.id}' (${newFieldType}) conflicts with: ${conflictDetails}. ` +
+                `DataRef: ${this.$name}`);
         }
     }
     $convertToDataValue() {
@@ -1393,6 +1412,9 @@ const addOnly = (includeOrExclude) => (...fieldTypes) => (target, propertyKey, d
     const set = descriptor.set;
     if (set != undefined) {
         descriptor.set = function (value) {
+            if (this === this._ruleNode) {
+                console.error(`Property '${propertyKey}' is being set through a proxy, which is not supported. Please use globals.functions.setProperty instead.`);
+            }
             if (fieldTypes.indexOf(this.fieldType) > -1 === includeOrExclude) {
                 set.call(this, value);
             }
@@ -1649,16 +1671,16 @@ class BaseNode {
         this.form.getEventQueue().runPendingQueue();
     }
     withDependencyTrackingControl(disableDependencyTracking, callback) {
-        const currentDependencyTracking = this.form.ruleEngine.getDependencyTracking();
+        const currentDependencyTracking = this.form?.ruleEngine.getDependencyTracking();
         if (disableDependencyTracking) {
-            this.form.ruleEngine.setDependencyTracking(false);
+            this.form?.ruleEngine.setDependencyTracking(false);
         }
         try {
             return callback();
         }
         finally {
             if (disableDependencyTracking) {
-                this.form.ruleEngine.setDependencyTracking(currentDependencyTracking);
+                this.form?.ruleEngine.setDependencyTracking(currentDependencyTracking);
             }
         }
     }
@@ -2851,7 +2873,7 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         method: httpVerb
     };
     let inputPayload;
-    let encryptOutput = {};
+    let encryptOutput = {}, cryptoMetadata = null;
     try {
         if (payload instanceof Promise) {
             payload = await payload;
@@ -2865,6 +2887,7 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         encryptOutput = { ...payload };
         headers = { ...payload.headers };
         payload = payload.body;
+        cryptoMetadata = payload.cryptoMetadata;
         inputPayload = payload;
     }
     if (payload && payload instanceof FileObject && payload.data instanceof File) {
@@ -2929,6 +2952,7 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
         response.originalRequest = {
             url: endpoint,
             method: httpVerb,
+            ...(cryptoMetadata && { cryptoMetadata }),
             ...encryptOutput
         };
         response.submitter = targetField;
@@ -3427,10 +3451,11 @@ class FunctionRuntimeImpl {
                             throw error;
                         }
                         let finalHeaders = {};
-                        let finalBody = {};
+                        let finalBody = {}, finalCryptoMetadata = null;
                         if (args.length === 5) {
                             finalBody = payload.body || {};
                             finalHeaders = payload.headers || {};
+                            finalCryptoMetadata = payload.cryptoMetadata;
                         }
                         else {
                             finalBody = payload || {};
@@ -3450,7 +3475,7 @@ class FunctionRuntimeImpl {
                                 };
                             }
                         }
-                        const finalPayload = { 'body': finalBody, 'headers': finalHeaders };
+                        const finalPayload = { 'body': finalBody, 'headers': finalHeaders, ...(finalCryptoMetadata && { cryptoMetadata: finalCryptoMetadata }) };
                         try {
                             const response = await request(interpreter.globals, uri, httpVerb, finalPayload, success, errorFn, finalHeaders);
                             return response;
@@ -4782,10 +4807,10 @@ class Field extends Scriptable {
         if (this._jsonModel.enforceEnum === true && value != null) {
             const fn = constraints.enum;
             if (value instanceof Array && this.isArrayType()) {
-                return value.every(x => fn(this.enum || [], x).valid);
+                return value.every(x => fn(this._jsonModel.enum || [], x).valid);
             }
             else {
-                return fn(this.enum || [], value).valid;
+                return fn(this._jsonModel.enum || [], value).valid;
             }
         }
         return true;

package/esm/types/src/data/DataValue.d.ts

@@ -13,6 +13,7 @@ export default class DataValue {
     setValue(typedValue: any, originalValue: any, fromField: FieldModel): void;
     get $type(): string;
     $bindToField(field: FieldModel): void;
+    private _checkForTypeConflicts;
     $convertToDataValue(): DataValue;
     get $isDataGroup(): boolean;
     $addDataNode(name: string | number, value: DataValue, override?: boolean): void;

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

@@ -148,6 +148,7 @@ export declare const ConstraintType: Readonly<{
     EXPRESSION_MISMATCH: "expressionMismatch";
     EXCLUSIVE_MAXIMUM_MISMATCH: "exclusiveMaximumMismatch";
     EXCLUSIVE_MINIMUM_MISMATCH: "exclusiveMinimumMismatch";
+    ENUM_MISMATCH: "enumMismatch";
 }>;
 export declare const constraintKeys: Readonly<{
     pattern: "patternMismatch";
@@ -167,6 +168,7 @@ export declare const constraintKeys: Readonly<{
     validationExpression: "expressionMismatch";
     exclusiveMinimum: "exclusiveMinimumMismatch";
     exclusiveMaximum: "exclusiveMaximumMismatch";
+    enum: "enumMismatch";
 }>;
 export declare const setCustomDefaultConstraintTypeMessages: (messages: Record<string, string>) => void;
 export declare const getConstraintTypeMessages: () => {
@@ -187,5 +189,6 @@ export declare const getConstraintTypeMessages: () => {
     expressionMismatch: "Please enter a valid value.";
     exclusiveMinimumMismatch: "Value must be greater than ${0}.";
     exclusiveMaximumMismatch: "Value must be less than ${0}.";
+    enumMismatch: "Please select a value from the allowed options.";
 };
 export {};

package/lib/BaseNode.js

@@ -107,6 +107,9 @@ const addOnly = (includeOrExclude) => (...fieldTypes) => (target, propertyKey, d
     const set = descriptor.set;
     if (set != undefined) {
         descriptor.set = function (value) {
+            if (this === this._ruleNode) {
+                console.error(`Property '${propertyKey}' is being set through a proxy, which is not supported. Please use globals.functions.setProperty instead.`);
+            }
             if (fieldTypes.indexOf(this.fieldType) > -1 === includeOrExclude) {
                 set.call(this, value);
             }
@@ -347,16 +350,17 @@ class BaseNode {
         this.form.getEventQueue().runPendingQueue();
     }
     withDependencyTrackingControl(disableDependencyTracking, callback) {
-        const currentDependencyTracking = this.form.ruleEngine.getDependencyTracking();
+        var _a, _b, _c;
+        const currentDependencyTracking = (_a = this.form) === null || _a === void 0 ? void 0 : _a.ruleEngine.getDependencyTracking();
         if (disableDependencyTracking) {
-            this.form.ruleEngine.setDependencyTracking(false);
+            (_b = this.form) === null || _b === void 0 ? void 0 : _b.ruleEngine.setDependencyTracking(false);
         }
         try {
             return callback();
         }
         finally {
             if (disableDependencyTracking) {
-                this.form.ruleEngine.setDependencyTracking(currentDependencyTracking);
+                (_c = this.form) === null || _c === void 0 ? void 0 : _c.ruleEngine.setDependencyTracking(currentDependencyTracking);
             }
         }
     }

package/lib/Field.js

@@ -504,10 +504,10 @@ class Field extends Scriptable_1.default {
         if (this._jsonModel.enforceEnum === true && value != null) {
             const fn = constraints.enum;
             if (value instanceof Array && this.isArrayType()) {
-                return value.every(x => fn(this.enum || [], x).valid);
+                return value.every(x => fn(this._jsonModel.enum || [], x).valid);
             }
             else {
-                return fn(this.enum || [], value).valid;
+                return fn(this._jsonModel.enum || [], value).valid;
             }
         }
         return true;

package/lib/data/DataValue.d.ts

@@ -13,6 +13,7 @@ export default class DataValue {
     setValue(typedValue: any, originalValue: any, fromField: FieldModel): void;
     get $type(): string;
     $bindToField(field: FieldModel): void;
+    private _checkForTypeConflicts;
     $convertToDataValue(): DataValue;
     get $isDataGroup(): boolean;
     $addDataNode(name: string | number, value: DataValue, override?: boolean): void;

package/lib/data/DataValue.js

@@ -53,6 +53,22 @@ class DataValue {
     $bindToField(field) {
         if (this.$_fields.indexOf(field) === -1) {
             this.$_fields.push(field);
+            this._checkForTypeConflicts(field);
+        }
+    }
+    _checkForTypeConflicts(newField) {
+        if (this.$_fields.length <= 1) {
+            return;
+        }
+        const newFieldType = newField.type;
+        const conflictingFields = this.$_fields.filter(existingField => existingField &&
+            existingField !== newField &&
+            existingField.type !== newFieldType);
+        if (conflictingFields.length > 0) {
+            const conflictDetails = conflictingFields.map(field => `Field "${field.id}" (${field.type})`).join(', ');
+            console.error('Type conflict detected: Multiple fields with same dataRef have different types. ' +
+                `New field '${newField.id}' (${newFieldType}) conflicts with: ${conflictDetails}. ` +
+                `DataRef: ${this.$name}`);
         }
     }
     $convertToDataValue() {

package/lib/rules/FunctionRuntime.js

@@ -37,7 +37,7 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
         method: httpVerb
     };
     let inputPayload;
-    let encryptOutput = {};
+    let encryptOutput = {}, cryptoMetadata = null;
     try {
         if (payload instanceof Promise) {
             payload = yield payload;
@@ -51,6 +51,7 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
         encryptOutput = Object.assign({}, payload);
         headers = Object.assign({}, payload.headers);
         payload = payload.body;
+        cryptoMetadata = payload.cryptoMetadata;
         inputPayload = payload;
     }
     if (payload && payload instanceof FileObject_1.FileObject && payload.data instanceof File) {
@@ -109,7 +110,7 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
     };
     try {
         const response = yield (0, Fetch_1.request)(endpoint, inputPayload, requestOptions);
-        response.originalRequest = Object.assign({ url: endpoint, method: httpVerb }, encryptOutput);
+        response.originalRequest = Object.assign(Object.assign({ url: endpoint, method: httpVerb }, (cryptoMetadata && { cryptoMetadata })), encryptOutput);
         response.submitter = targetField;
         const enhancedPayload = Object.assign(Object.assign({}, baseEnhancedPayload), { response, request: response.originalRequest });
         if ((response === null || response === void 0 ? void 0 : response.status) >= 200 && (response === null || response === void 0 ? void 0 : response.status) <= 299) {
@@ -602,10 +603,11 @@ class FunctionRuntimeImpl {
                             throw error;
                         }
                         let finalHeaders = {};
-                        let finalBody = {};
+                        let finalBody = {}, finalCryptoMetadata = null;
                         if (args.length === 5) {
                             finalBody = payload.body || {};
                             finalHeaders = payload.headers || {};
+                            finalCryptoMetadata = payload.cryptoMetadata;
                         }
                         else {
                             finalBody = payload || {};
@@ -619,7 +621,7 @@ class FunctionRuntimeImpl {
                                 finalHeaders = Object.assign(Object.assign({}, finalHeaders), retryOptions.headers);
                             }
                         }
-                        const finalPayload = { 'body': finalBody, 'headers': finalHeaders };
+                        const finalPayload = Object.assign({ 'body': finalBody, 'headers': finalHeaders }, (finalCryptoMetadata && { cryptoMetadata: finalCryptoMetadata }));
                         try {
                             const response = yield (0, exports.request)(interpreter.globals, uri, httpVerb, finalPayload, success, errorFn, finalHeaders);
                             return response;

package/lib/types/Json.d.ts

@@ -148,6 +148,7 @@ export declare const ConstraintType: Readonly<{
     EXPRESSION_MISMATCH: "expressionMismatch";
     EXCLUSIVE_MAXIMUM_MISMATCH: "exclusiveMaximumMismatch";
     EXCLUSIVE_MINIMUM_MISMATCH: "exclusiveMinimumMismatch";
+    ENUM_MISMATCH: "enumMismatch";
 }>;
 export declare const constraintKeys: Readonly<{
     pattern: "patternMismatch";
@@ -167,6 +168,7 @@ export declare const constraintKeys: Readonly<{
     validationExpression: "expressionMismatch";
     exclusiveMinimum: "exclusiveMinimumMismatch";
     exclusiveMaximum: "exclusiveMaximumMismatch";
+    enum: "enumMismatch";
 }>;
 export declare const setCustomDefaultConstraintTypeMessages: (messages: Record<string, string>) => void;
 export declare const getConstraintTypeMessages: () => {
@@ -187,5 +189,6 @@ export declare const getConstraintTypeMessages: () => {
     expressionMismatch: "Please enter a valid value.";
     exclusiveMinimumMismatch: "Value must be greater than ${0}.";
     exclusiveMaximumMismatch: "Value must be less than ${0}.";
+    enumMismatch: "Please select a value from the allowed options.";
 };
 export {};

package/lib/types/Json.js

@@ -25,7 +25,8 @@ exports.ConstraintType = Object.freeze({
     MAX_ITEMS_MISMATCH: 'maxItemsMismatch',
     EXPRESSION_MISMATCH: 'expressionMismatch',
     EXCLUSIVE_MAXIMUM_MISMATCH: 'exclusiveMaximumMismatch',
-    EXCLUSIVE_MINIMUM_MISMATCH: 'exclusiveMinimumMismatch'
+    EXCLUSIVE_MINIMUM_MISMATCH: 'exclusiveMinimumMismatch',
+    ENUM_MISMATCH: 'enumMismatch'
 });
 exports.constraintKeys = Object.freeze({
     pattern: exports.ConstraintType.PATTERN_MISMATCH,
@@ -44,7 +45,8 @@ exports.constraintKeys = Object.freeze({
     maxItems: exports.ConstraintType.MAX_ITEMS_MISMATCH,
     validationExpression: exports.ConstraintType.EXPRESSION_MISMATCH,
     exclusiveMinimum: exports.ConstraintType.EXCLUSIVE_MINIMUM_MISMATCH,
-    exclusiveMaximum: exports.ConstraintType.EXCLUSIVE_MAXIMUM_MISMATCH
+    exclusiveMaximum: exports.ConstraintType.EXCLUSIVE_MAXIMUM_MISMATCH,
+    enum: exports.ConstraintType.ENUM_MISMATCH
 });
 const defaultConstraintTypeMessages = Object.freeze({
     [exports.ConstraintType.PATTERN_MISMATCH]: 'Please match the format requested.',
@@ -63,7 +65,8 @@ const defaultConstraintTypeMessages = Object.freeze({
     [exports.ConstraintType.MAX_ITEMS_MISMATCH]: 'Specify a number of items equal to or less than ${0}.',
     [exports.ConstraintType.EXPRESSION_MISMATCH]: 'Please enter a valid value.',
     [exports.ConstraintType.EXCLUSIVE_MINIMUM_MISMATCH]: 'Value must be greater than ${0}.',
-    [exports.ConstraintType.EXCLUSIVE_MAXIMUM_MISMATCH]: 'Value must be less than ${0}.'
+    [exports.ConstraintType.EXCLUSIVE_MAXIMUM_MISMATCH]: 'Value must be less than ${0}.',
+    [exports.ConstraintType.ENUM_MISMATCH]: 'Please select a value from the allowed options.'
 });
 const transformObjectKeys = (obj, transformer) => {
     if (typeof obj !== 'object' || obj === null) {
@@ -81,7 +84,13 @@ const transformObjectKeys = (obj, transformer) => {
 };
 let customConstraintTypeMessages = {};
 const setCustomDefaultConstraintTypeMessages = (messages) => {
-    customConstraintTypeMessages = transformObjectKeys(messages, (key) => {
+    const validMessages = Object.entries(messages).reduce((acc, [key, value]) => {
+        if (exports.constraintKeys[key] !== undefined) {
+            acc[key] = value;
+        }
+        return acc;
+    }, {});
+    customConstraintTypeMessages = transformObjectKeys(validMessages, (key) => {
         return exports.constraintKeys[key];
     });
 };

package/package.json

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