@aemforms/af-core 0.22.158 → 0.22.162

package/README.md

@@ -33,6 +33,24 @@ const data = {...}
 const valid = validateFormInstance(formJson, data)
 ```
 
+## Testing Local Changes
+
+```bash
+# Login to download dependencies
+npm login
+
+# Build the package
+npm run build
+
+# Link it for local testing
+npm link
+```
+
+In your project that uses this package:
+```bash
+npm link @aemforms/af-core
+```
+
 ## License
 
 Copyright 2022 Adobe

package/esm/afb-runtime.js

@@ -545,7 +545,7 @@ const isAlphaNum = function (ch) {
     return (ch >= 'a' && ch <= 'z')
         || (ch >= 'A' && ch <= 'Z')
         || (ch >= '0' && ch <= '9')
-        || ch === '_';
+        || ch === '_' || ch === '-';
 };
 const isGlobal = (prev, stream, pos) => {
     return prev === null && stream[pos] === globalStartToken;
@@ -560,7 +560,7 @@ const isIdentifier = (stream, pos) => {
     }
     return (ch >= 'a' && ch <= 'z')
         || (ch >= 'A' && ch <= 'Z')
-        || ch === '_';
+        || ch === '_' || ch === '-';
 };
 const isNum = (ch) => {
     return (ch >= '0' && ch <= '9');
@@ -1366,7 +1366,8 @@ const editableProperties = [
     'maxItems',
     'minimum',
     'minItems',
-    'checked'
+    'checked',
+    'placeholder'
 ];
 const dynamicProps = [
     ...editableProperties,
@@ -2934,6 +2935,9 @@ const request = async (context, uri, httpVerb, payload, success, error, headers)
     if (payload.body && payload.headers) {
         encryptOutput = { ...payload };
         headers = { ...payload.headers };
+        if (payload.options && typeof payload.options === 'object') {
+            Object.assign(requestOptions, payload.options);
+        }
         payload = payload.body;
         cryptoMetadata = payload.cryptoMetadata;
         inputPayload = payload;
@@ -3226,6 +3230,47 @@ class FunctionRuntimeImpl {
                                         filesMap[qualifiedName] = field.serialize();
                                     }
                                     return filesMap;
+                                },
+                                setVariable: (variableName, variableValue, target) => {
+                                    const args = [variableName, variableValue, target];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().setVariable._func.call(undefined, args, data, interpreter);
+                                },
+                                getVariable: (variableName, target) => {
+                                    const args = [variableName, target];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().getVariable._func.call(undefined, args, data, interpreter);
+                                },
+                                request: async (options) => {
+                                    const { url, method = 'GET', body: requestBody = {}, headers = { 'Content-Type': 'application/json' }, options: fetchOptions } = options;
+                                    const funcs = FunctionRuntimeImpl.getInstance().getFunctions();
+                                    const externalizedUrl = funcs.externalize._func.call(undefined, [url], data, interpreter);
+                                    const random = Math.floor(Math.random() * 1000000);
+                                    const now = Date.now();
+                                    const internalSuccess = `custom:__internalSuccess_${random}_${now}`;
+                                    const internalError = `custom:__internalError_${random}_${now}`;
+                                    const encryptPayload = { body: requestBody, headers };
+                                    if (fetchOptions) {
+                                        encryptPayload.options = fetchOptions;
+                                    }
+                                    const payload = await funcs.encrypt._func.call(undefined, [encryptPayload], data, interpreter);
+                                    const requestArgs = [externalizedUrl, method, payload, internalSuccess, internalError];
+                                    const requestFn = funcs.requestWithRetry._func.call(undefined, requestArgs, data, interpreter);
+                                    const response = await funcs.retryHandler._func.call(undefined, [requestFn], data, interpreter);
+                                    const isSuccess = response?.status >= 200 && response?.status <= 299;
+                                    if (isSuccess && response?.body) {
+                                        const decryptedBody = await funcs.decrypt._func.call(undefined, [response.body, response.originalRequest], data, interpreter);
+                                        return {
+                                            ok: true,
+                                            status: response.status,
+                                            body: decryptedBody,
+                                            headers: response.headers
+                                        };
+                                    }
+                                    return {
+                                        ok: isSuccess,
+                                        status: response?.status,
+                                        body: response?.body,
+                                        headers: response?.headers
+                                    };
                                 }
                             }
                         };
@@ -3549,6 +3594,13 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            externalize: {
+                _func: (args, data, interpreter) => {
+                    const url = toString(args[0]);
+                    return url;
+                },
+                _signature: []
+            },
             awaitFn: {
                 _func: async (args, data, interpreter) => {
                     const success = args[1];
@@ -4628,6 +4680,9 @@ class Field extends Scriptable {
     get placeholder() {
         return this._jsonModel.placeholder;
     }
+    set placeholder(value) {
+        this._setProperty('placeholder', value);
+    }
     get readOnly() {
         if (this.parent.readOnly !== undefined) {
             return this.parent.readOnly === true ? true : this._jsonModel.readOnly;
@@ -4729,7 +4784,7 @@ class Field extends Scriptable {
     }
     get editValue() {
         const df = this.editFormat;
-        if (df && this.isNotEmpty(this.value) && this.valid !== false) {
+        if (df && this.isNotEmpty(this.value) && this?.validity?.typeMismatch !== true) {
             try {
                 return format(this.value, this.lang, df);
             }
@@ -5439,6 +5494,20 @@ class CheckboxGroup extends Field {
     }
 }
 
+const warnedPatterns = new Set();
+function normalizeDatePattern(pattern) {
+    if (!pattern || typeof pattern !== 'string') {
+        return pattern;
+    }
+    const normalized = pattern
+        .replace(/DD/g, 'dd')
+        .replace(/YYYY/g, 'yyyy');
+    if (normalized !== pattern && !warnedPatterns.has(pattern)) {
+        warnedPatterns.add(pattern);
+        console.warn(`[AEM Forms] Date field pattern "${pattern}" uses deprecated format. Auto-corrected to "${normalized}". Please update to use lowercase 'y' for year and 'd' for day.`);
+    }
+    return normalized;
+}
 class DateField extends Field {
     locale;
     _dataFormat = 'yyyy-MM-dd';
@@ -5448,9 +5517,13 @@ class DateField extends Field {
         if (!this._jsonModel.editFormat) {
             this._jsonModel.editFormat = 'short';
         }
+        this._jsonModel.editFormat = normalizeDatePattern(this._jsonModel.editFormat);
         if (!this._jsonModel.displayFormat) {
             this._jsonModel.displayFormat = this._jsonModel.editFormat;
         }
+        else {
+            this._jsonModel.displayFormat = normalizeDatePattern(this._jsonModel.displayFormat);
+        }
         if (!this._jsonModel.placeholder) {
             this._jsonModel.placeholder = parseDateSkeleton(this._jsonModel.editFormat, this.locale);
         }

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

@@ -32,6 +32,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     get displayFormat(): string | undefined;
     get displayValueExpression(): string | undefined;
     get placeholder(): string | undefined;
+    set placeholder(value: string | undefined);
     get readOnly(): boolean | undefined;
     set readOnly(e: boolean | undefined);
     get enabled(): boolean | undefined;

package/esm/types/src/rules/FunctionRuntime.d.ts

@@ -67,6 +67,10 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
+        externalize: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => string;
+            _signature: never[];
+        };
         awaitFn: {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<{}>;
             _signature: never[];

package/lib/BaseNode.js

@@ -35,7 +35,8 @@ exports.editableProperties = [
     'maxItems',
     'minimum',
     'minItems',
-    'checked'
+    'checked',
+    'placeholder'
 ];
 exports.dynamicProps = [
     ...exports.editableProperties,

package/lib/DateField.js

@@ -11,6 +11,20 @@ var _DateField_instances, _DateField_convertNumberToDate;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("./Field"));
 const af_formatters_1 = require("@aemforms/af-formatters");
+const warnedPatterns = new Set();
+function normalizeDatePattern(pattern) {
+    if (!pattern || typeof pattern !== 'string') {
+        return pattern;
+    }
+    const normalized = pattern
+        .replace(/DD/g, 'dd')
+        .replace(/YYYY/g, 'yyyy');
+    if (normalized !== pattern && !warnedPatterns.has(pattern)) {
+        warnedPatterns.add(pattern);
+        console.warn(`[AEM Forms] Date field pattern "${pattern}" uses deprecated format. Auto-corrected to "${normalized}". Please update to use lowercase 'y' for year and 'd' for day.`);
+    }
+    return normalized;
+}
 class DateField extends Field_1.default {
     constructor() {
         super(...arguments);
@@ -23,9 +37,13 @@ class DateField extends Field_1.default {
         if (!this._jsonModel.editFormat) {
             this._jsonModel.editFormat = 'short';
         }
+        this._jsonModel.editFormat = normalizeDatePattern(this._jsonModel.editFormat);
         if (!this._jsonModel.displayFormat) {
             this._jsonModel.displayFormat = this._jsonModel.editFormat;
         }
+        else {
+            this._jsonModel.displayFormat = normalizeDatePattern(this._jsonModel.displayFormat);
+        }
         if (!this._jsonModel.placeholder) {
             this._jsonModel.placeholder = (0, af_formatters_1.parseDateSkeleton)(this._jsonModel.editFormat, this.locale);
         }

package/lib/Field.d.ts

@@ -32,6 +32,7 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     get displayFormat(): string | undefined;
     get displayValueExpression(): string | undefined;
     get placeholder(): string | undefined;
+    set placeholder(value: string | undefined);
     get readOnly(): boolean | undefined;
     set readOnly(e: boolean | undefined);
     get enabled(): boolean | undefined;

package/lib/Field.js

@@ -212,6 +212,9 @@ class Field extends Scriptable_1.default {
     get placeholder() {
         return this._jsonModel.placeholder;
     }
+    set placeholder(value) {
+        this._setProperty('placeholder', value);
+    }
     get readOnly() {
         if (this.parent.readOnly !== undefined) {
             return this.parent.readOnly === true ? true : this._jsonModel.readOnly;
@@ -311,8 +314,9 @@ class Field extends Scriptable_1.default {
         return df;
     }
     get editValue() {
+        var _a;
         const df = this.editFormat;
-        if (df && this.isNotEmpty(this.value) && this.valid !== false) {
+        if (df && this.isNotEmpty(this.value) && ((_a = this === null || this === void 0 ? void 0 : this.validity) === null || _a === void 0 ? void 0 : _a.typeMismatch) !== true) {
             try {
                 return (0, af_formatters_1.format)(this.value, this.lang, df);
             }

package/lib/rules/FunctionRuntime.d.ts

@@ -67,6 +67,10 @@ declare class FunctionRuntimeImpl {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => any;
             _signature: never[];
         };
+        externalize: {
+            _func: (args: Array<unknown>, data: unknown, interpreter: any) => string;
+            _signature: never[];
+        };
         awaitFn: {
             _func: (args: Array<unknown>, data: unknown, interpreter: any) => Promise<{}>;
             _signature: never[];

package/lib/rules/FunctionRuntime.js

@@ -50,6 +50,9 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
     if (payload.body && payload.headers) {
         encryptOutput = Object.assign({}, payload);
         headers = Object.assign({}, payload.headers);
+        if (payload.options && typeof payload.options === 'object') {
+            Object.assign(requestOptions, payload.options);
+        }
         payload = payload.body;
         cryptoMetadata = payload.cryptoMetadata;
         inputPayload = payload;
@@ -329,7 +332,48 @@ class FunctionRuntimeImpl {
                                         filesMap[qualifiedName] = field.serialize();
                                     }
                                     return filesMap;
-                                }
+                                },
+                                setVariable: (variableName, variableValue, target) => {
+                                    const args = [variableName, variableValue, target];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().setVariable._func.call(undefined, args, data, interpreter);
+                                },
+                                getVariable: (variableName, target) => {
+                                    const args = [variableName, target];
+                                    return FunctionRuntimeImpl.getInstance().getFunctions().getVariable._func.call(undefined, args, data, interpreter);
+                                },
+                                request: (options) => __awaiter(this, void 0, void 0, function* () {
+                                    const { url, method = 'GET', body: requestBody = {}, headers = { 'Content-Type': 'application/json' }, options: fetchOptions } = options;
+                                    const funcs = FunctionRuntimeImpl.getInstance().getFunctions();
+                                    const externalizedUrl = funcs.externalize._func.call(undefined, [url], data, interpreter);
+                                    const random = Math.floor(Math.random() * 1000000);
+                                    const now = Date.now();
+                                    const internalSuccess = `custom:__internalSuccess_${random}_${now}`;
+                                    const internalError = `custom:__internalError_${random}_${now}`;
+                                    const encryptPayload = { body: requestBody, headers };
+                                    if (fetchOptions) {
+                                        encryptPayload.options = fetchOptions;
+                                    }
+                                    const payload = yield funcs.encrypt._func.call(undefined, [encryptPayload], data, interpreter);
+                                    const requestArgs = [externalizedUrl, method, payload, internalSuccess, internalError];
+                                    const requestFn = funcs.requestWithRetry._func.call(undefined, requestArgs, data, interpreter);
+                                    const response = yield funcs.retryHandler._func.call(undefined, [requestFn], data, interpreter);
+                                    const isSuccess = (response === null || response === void 0 ? void 0 : response.status) >= 200 && (response === null || response === void 0 ? void 0 : response.status) <= 299;
+                                    if (isSuccess && (response === null || response === void 0 ? void 0 : response.body)) {
+                                        const decryptedBody = yield funcs.decrypt._func.call(undefined, [response.body, response.originalRequest], data, interpreter);
+                                        return {
+                                            ok: true,
+                                            status: response.status,
+                                            body: decryptedBody,
+                                            headers: response.headers
+                                        };
+                                    }
+                                    return {
+                                        ok: isSuccess,
+                                        status: response === null || response === void 0 ? void 0 : response.status,
+                                        body: response === null || response === void 0 ? void 0 : response.body,
+                                        headers: response === null || response === void 0 ? void 0 : response.headers
+                                    };
+                                })
                             }
                         };
                         return funcDef(...args, globals);
@@ -647,6 +691,13 @@ class FunctionRuntimeImpl {
                 },
                 _signature: []
             },
+            externalize: {
+                _func: (args, data, interpreter) => {
+                    const url = toString(args[0]);
+                    return url;
+                },
+                _signature: []
+            },
             awaitFn: {
                 _func: (args, data, interpreter) => __awaiter(this, void 0, void 0, function* () {
                     const success = args[1];

package/lib/utils/DataRefParser.js

@@ -49,7 +49,7 @@ const isAlphaNum = function (ch) {
     return (ch >= 'a' && ch <= 'z')
         || (ch >= 'A' && ch <= 'Z')
         || (ch >= '0' && ch <= '9')
-        || ch === '_';
+        || ch === '_' || ch === '-';
 };
 const isGlobal = (prev, stream, pos) => {
     return prev === null && stream[pos] === globalStartToken;
@@ -64,7 +64,7 @@ const isIdentifier = (stream, pos) => {
     }
     return (ch >= 'a' && ch <= 'z')
         || (ch >= 'A' && ch <= 'Z')
-        || ch === '_';
+        || ch === '_' || ch === '-';
 };
 const isNum = (ch) => {
     return (ch >= '0' && ch <= '9');

package/package.json

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