@bolttech/form-engine-core 1.0.0-beta.16 → 1.0.0-beta.18

package/index.esm.js

@@ -1,6 +1,6 @@
 import { Subject, Subscription, groupBy, mergeMap, debounceTime, filter, combineLatest, startWith, map, distinctUntilKeyChanged } from 'rxjs';
 import creditCardType from 'credit-card-type';
-import { isNumber as isNumber$1, isFunction, cloneDeep, merge, isEqual, get, isNil, set } from 'lodash';
+import { isNumber as isNumber$1, isFunction, cloneDeep, isEqual, get, isNil, set } from 'lodash';
 import { getCurrencySymbol } from '@gaignoux/currency';
 
 var TMutationEnum;
@@ -2504,7 +2504,7 @@ class FormField {
     submitEvent,
     visibility
   }) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     this.valueSubscription$ = new Subscription();
     this.fieldStateSubscription$ = new Subscription();
     this.formIndex = formIndex;
@@ -2520,7 +2520,6 @@ class FormField {
     this.path = path;
     this.children = children;
     this.validations = cloneDeep(schemaComponent.validations);
-    this.errorMessages = cloneDeep((_a = schemaComponent.validations) === null || _a === void 0 ? void 0 : _a.messages);
     this.visibilityConditions = cloneDeep(schemaComponent.visibilityConditions);
     this.resetValues = cloneDeep(schemaComponent.resetValues);
     this.resetPropertyValues = cloneDeep(schemaComponent.resetPropertyValues);
@@ -2528,7 +2527,7 @@ class FormField {
     this.formatters = cloneDeep(schemaComponent.formatters);
     this.masks = cloneDeep(schemaComponent.masks);
     if (mapper.valueChangeEvent) this.valueChangeEvent = mapper.valueChangeEvent;
-    if ((_b = mapper.events) === null || _b === void 0 ? void 0 : _b.setValue) this.valuePropName = mapper.events.setValue;
+    if ((_a = mapper.events) === null || _a === void 0 ? void 0 : _a.setValue) this.valuePropName = mapper.events.setValue;
     this.mapper = mapper;
     this.validateVisibility = validateVisibility;
     this.resetValue = resetValue;
@@ -2547,10 +2546,10 @@ class FormField {
     this._visibility = typeof visibility === 'boolean' ? visibility : true;
     this._api = {
       default: {
-        response: ((_e = (_d = (_c = this.apiSchema) === null || _c === void 0 ? void 0 : _c.defaultConfig) === null || _d === void 0 ? void 0 : _d.config) === null || _e === void 0 ? void 0 : _e.fallbackValue) || '',
+        response: ((_d = (_c = (_b = this.apiSchema) === null || _b === void 0 ? void 0 : _b.defaultConfig) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.fallbackValue) || '',
         status: null
       },
-      named: ((_f = this.apiSchema) === null || _f === void 0 ? void 0 : _f.configs) && Object.keys((_g = this.apiSchema) === null || _g === void 0 ? void 0 : _g.configs).reduce((acc, curr) => {
+      named: ((_e = this.apiSchema) === null || _e === void 0 ? void 0 : _e.configs) && Object.keys((_f = this.apiSchema) === null || _f === void 0 ? void 0 : _f.configs).reduce((acc, curr) => {
         var _a, _b;
         acc[curr] = {
           response: ((_b = (_a = this.apiSchema) === null || _a === void 0 ? void 0 : _a.configs) === null || _b === void 0 ? void 0 : _b[curr].config.fallbackValue) || '',
@@ -2611,9 +2610,8 @@ class FormField {
    * @param {Record<string, unknown>} props - The new properties to be set.
    */
   set props(props) {
-    const diffProps = merge(cloneDeep(this.props), props);
-    if (typeof diffProps === 'undefined' || isEqual(diffProps, this.props)) return;
-    this._props = diffProps;
+    if (typeof props === 'undefined' || isEqual(props, this.props)) return;
+    this._props = props;
     this.propsSubject$.next(this.props);
     this.templateSubject$.next({
       scope: 'fields',
@@ -2632,6 +2630,7 @@ class FormField {
       return props.filter(el => typeof el === 'string' && el.includes('${') ? false : true).map(el => FormField.filterProps(el));
     }
     if (typeof props === 'object' && props !== null) {
+      if (props instanceof Date) return props;
       return Object.keys(props).reduce((acc, curr) => {
         const propValue = props[curr];
         if (typeof propValue === 'string' && propValue.includes('${')) {
@@ -2947,16 +2946,17 @@ class FormField {
     const errors = {};
     const schemaValidations = (_a = this.validations) === null || _a === void 0 ? void 0 : _a.methods;
     schemaValidations && Object.keys(schemaValidations).forEach(validationKey => {
+      var _a;
       const error = handleValidation(this.value, schemaValidations, validations, validationKey);
       // setting valid flag
       valid = !error && valid;
       // setting error messages
-      if (error && this.errorMessages) {
-        if (validationKey in this.errorMessages) {
-          const messages = this.errorMessages;
+      if (error && ((_a = this.validations) === null || _a === void 0 ? void 0 : _a.messages)) {
+        if (validationKey in this.validations.messages) {
+          const messages = this.validations.messages;
           errors[validationKey] = messages[validationKey];
-        } else if ('default' in this.errorMessages) {
-          errors[validationKey] = this.errorMessages.default;
+        } else if ('default' in this.validations.messages) {
+          errors[validationKey] = this.validations.messages.default;
         }
       } else {
         delete errors[validationKey];
@@ -4367,10 +4367,15 @@ class FormGroup {
     }) => ids.includes(formIndex)), groupBy(({
       event,
       formIndex
-    }) => `${event}.${formIndex}`), mergeMap(group$ => group$.pipe(debounceTime(this.config.defaultStateRefreshTimeMS))), map(() => ids.reduce((acc, curr) => {
+    }) => `${event}.${formIndex}`), mergeMap(group$ => group$.pipe(debounceTime(this.config.defaultStateRefreshTimeMS))), map(({
+      fieldIndex,
+      formIndex
+    }) => ids.reduce((acc, curr) => {
       const formInstance = this.forms.get(curr);
       if (formInstance) {
         acc[curr] = {
+          formId: formIndex,
+          formField: fieldIndex,
           values: formInstance.getFormValues()
         };
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolttech/form-engine-core",
-  "version": "1.0.0-beta.16",
+  "version": "1.0.0-beta.18",
   "module": "./index.esm.js",
   "type": "module",
   "main": "./index.esm.js",

package/src/managers/field.d.ts

@@ -22,7 +22,6 @@ declare class FormField {
     visibilityConditions?: TVisibility[];
     resetValues?: TResetValueMethods[];
     resetPropertyValues?: TResetPathMethods[];
-    errorMessages?: TErrorMessages;
     apiSchema?: TApiEvent;
     formatters?: TFormatters;
     masks?: TMasks;

package/src/types/event.d.ts

@@ -88,6 +88,8 @@ type TFieldValidationPayload = {
  * Form Group onData event emitted payload on callback function parameter
  */
 type TFormGroupOnDataEventPayload<T> = Record<string, {
+    formId: string;
+    formField: string;
     values?: TFormValues<T>;
 }>;
 /**