@bolttech/form-engine-core 0.0.1-beta.42 → 0.0.1-beta.44

package/index.esm.js

@@ -140,45 +140,31 @@ function extractFieldKeys(expression) {
  * // expressions will contain an array of objects with origin expressions, field keys, and destination paths.
  * ```
  */
-function traverseObject(obj, path) {
+function traverseObject(element, path) {
   const result = [];
-  for (const key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      const value = obj[key];
-      if (Array.isArray(value)) {
-        value.forEach((item, index) => {
-          if (typeof item === 'object') {
-            result.push(...traverseObject(item, `${path ? `${path}.` : ``}${key}.${index}`));
-          } else if (typeof item === 'string') {
-            if (String(item).includes('${')) {
-              // const extractedPath = item.replace(/\$|{|}/g, '').split('.');
-              const extractedOriginPath = `${path ? `${path}.` : ``}${key}`.split('.');
-              result.push(Object.assign(Object.assign({
-                originExpression: item
-              }, extractFieldKeys(item)), {
-                destinationKey: extractedOriginPath[0],
-                destinationProperty: extractedOriginPath[1],
-                destinationPath: extractedOriginPath.slice(2)
-              }));
-            }
-          }
-        });
-      } else if (typeof value === 'object') {
+  if (Array.isArray(element)) {
+    element.forEach((item, index) => {
+      result.push(...traverseObject(item, `${path ? `${path}.` : ``}${index}`));
+    });
+  } else if (typeof element === 'object') {
+    for (const key in element) {
+      if (Object.prototype.hasOwnProperty.call(element, key)) {
+        const value = element[key];
         result.push(...traverseObject(value, `${path ? `${path}.` : ``}${key}`));
-      } else if (typeof value === 'string') {
-        if (value.includes('${')) {
-          // const extractedPath = value.replace(/\$|{|}/g, '').split('.');
-          const destinationPath = `${path ? `${path}.` : ``}${key}`.split('.');
-          result.push(Object.assign(Object.assign({
-            originExpression: value
-          }, extractFieldKeys(value)), {
-            destinationKey: destinationPath[0],
-            destinationProperty: destinationPath[1],
-            destinationPath: destinationPath.slice(2)
-          }));
-        }
       }
     }
+  } else if (typeof element === 'string') {
+    if (element.includes('${')) {
+      // const extractedPath = value.replace(/\$|{|}/g, '').split('.');
+      const destinationPath = (path ? path : '').split('.');
+      result.push(Object.assign(Object.assign({
+        originExpression: element
+      }, extractFieldKeys(element)), {
+        destinationKey: destinationPath[0],
+        destinationProperty: destinationPath[1],
+        destinationPath: destinationPath.slice(2)
+      }));
+    }
   }
   return result;
 }
@@ -1236,6 +1222,44 @@ const between = (value, validations) => {
   const num = Number(value);
   return !Number.isNaN(num) && !(+num >= validations.between.start && +num <= validations.between.end);
 };
+/**
+ * Checks if a given value is less than a specified threshold.
+ *
+ * @param value - The value to be checked. This value will be converted to a number.
+ * @param validations - An object containing validation methods, specifically the `lessThan` property which holds the threshold value.
+ * @returns Returns `false` if the `lessThan` threshold is not provided or if the value is not a valid number. Otherwise, returns `true` if the value is greater than or equal to the `lessThan` threshold.
+ *
+ * @example
+ * ```typescript
+ * const validations = { lessThan: 10 };
+ * console.log(lessThan(5, validations)); // true
+ * console.log(lessThan(15, validations)); // false
+ * ```
+ */
+const lessThan = (value, validations) => {
+  const number = Number(value);
+  if (!validations.lessThan || Number.isNaN(number)) return false;
+  return number >= validations.lessThan;
+};
+/**
+ * Checks if a given value is greater than a specified threshold.
+ *
+ * @param value - The value to be checked. This value will be converted to a number.
+ * @param validations - An object containing validation methods, specifically the `greaterThan` property which holds the threshold value.
+ * @returns Returns `false` if the `greaterThan` threshold is not provided or if the value is not a valid number. Otherwise, returns `true` if the value is less than or equal to the `greaterThan` threshold.
+ *
+ * @example
+ * ```typescript
+ * const validations = { greaterThan: 10 };
+ * console.log(greaterThan(15, validations)); // true
+ * console.log(greaterThan(5, validations)); // false
+ * ```
+ */
+const greaterThan = (value, validations) => {
+  const number = Number(value);
+  if (!validations.greaterThan || Number.isNaN(number)) return false;
+  return number <= validations.greaterThan;
+};
 /**
  * Validates if a value contains sequential numbers.
  *
@@ -2341,6 +2365,8 @@ const multipleValidations = (value, methods) => {
 const validations = {
   max,
   min,
+  lessThan,
+  greaterThan,
   length,
   regex,
   url,
@@ -2887,6 +2913,17 @@ class FormField {
   }) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     return __awaiter(this, void 0, void 0, function* () {
+      const configRequest = config => __awaiter(this, void 0, void 0, function* () {
+        try {
+          const responseData = yield makeRequest(config.method, config.url, config.headers, config.body);
+          const apiResponseData = JSON.parse(String(responseData));
+          const response = config.resultPath ? get(apiResponseData, config.resultPath) : apiResponseData;
+          // this.apiResponseData = { response };
+          return response;
+        } catch (e) {
+          return !isNil(config === null || config === void 0 ? void 0 : config.fallbackValue) ? config.fallbackValue : 'error';
+        }
+      });
       if (!((_b = (_a = this.apiSchema) === null || _a === void 0 ? void 0 : _a.defaultConfig) === null || _b === void 0 ? void 0 : _b.events.includes(event)) && !(((_c = this.apiSchema) === null || _c === void 0 ? void 0 : _c.configs) && Object.keys((_d = this.apiSchema) === null || _d === void 0 ? void 0 : _d.configs).some(key => {
         var _a, _b;
         return (_b = (_a = this.apiSchema) === null || _a === void 0 ? void 0 : _a.configs) === null || _b === void 0 ? void 0 : _b[key].events.includes(event);
@@ -2897,19 +2934,10 @@ class FormField {
       };
       const config = (_e = this.apiSchema.defaultConfig) === null || _e === void 0 ? void 0 : _e.config;
       if (config && ((_g = (_f = this.apiSchema) === null || _f === void 0 ? void 0 : _f.defaultConfig) === null || _g === void 0 ? void 0 : _g.events.includes(event)) && this.checkApiRequestValidations(config)) {
-        try {
-          const responseData = yield makeRequest(config.method, config.url, config.headers, config.body);
-          const apiResponseData = JSON.parse(String(responseData));
-          const response = config.resultPath ? get(apiResponseData, config.resultPath) : apiResponseData;
-          // this.apiResponseData = { response };
-          responses.default = {
-            response
-          };
-        } catch (e) {
-          responses.default = {
-            response: !isNil(config === null || config === void 0 ? void 0 : config.fallbackValue) ? config.fallbackValue : 'error'
-          };
-        }
+        const response = yield configRequest(config);
+        responses.default = {
+          response
+        };
       }
       if (((_h = this.apiSchema) === null || _h === void 0 ? void 0 : _h.configs) && Object.keys((_j = this.apiSchema) === null || _j === void 0 ? void 0 : _j.configs).some(key => {
         var _a, _b;
@@ -2920,38 +2948,21 @@ class FormField {
             @TODO handle promises with error
           */
           const result = yield Promise.all(Object.keys(this.apiSchema.configs).map(configKey => __awaiter(this, void 0, void 0, function* () {
-            return new Promise(res => {
-              var _a, _b, _c, _d;
-              const config = (_b = (_a = this.apiSchema) === null || _a === void 0 ? void 0 : _a.configs) === null || _b === void 0 ? void 0 : _b[configKey].config;
-              if (config && ((_d = (_c = this.apiSchema) === null || _c === void 0 ? void 0 : _c.configs) === null || _d === void 0 ? void 0 : _d[configKey].events.includes(event)) && this.checkApiRequestValidations(config)) {
-                try {
-                  makeRequest(config.method, config.url, config.headers, config.body).then(responseData => {
-                    const apiResponseData = JSON.parse(String(responseData));
-                    const response = get(apiResponseData, config.resultPath || '');
-                    res({
-                      name: configKey,
-                      result: {
-                        response
-                      }
-                    });
-                    // responses.named![configKey] = { response };
-                  });
-                } catch (e) {
-                  res({
-                    name: configKey,
-                    result: {
-                      response: !isNil(config.fallbackValue) ? config.fallbackValue : 'error'
-                    }
-                  });
+            var _k, _l, _m, _o;
+            const config = (_l = (_k = this.apiSchema) === null || _k === void 0 ? void 0 : _k.configs) === null || _l === void 0 ? void 0 : _l[configKey].config;
+            if (config && ((_o = (_m = this.apiSchema) === null || _m === void 0 ? void 0 : _m.configs) === null || _o === void 0 ? void 0 : _o[configKey].events.includes(event)) && this.checkApiRequestValidations(config)) {
+              const response = yield configRequest(config);
+              return {
+                name: configKey,
+                result: {
+                  response
                 }
-              }
-            });
+              };
+            }
+            return null;
           })));
-          result.forEach(({
-            name,
-            result
-          }) => {
-            if (responses.named) responses.named[name] = result;
+          result.forEach(payload => {
+            if (payload && responses.named) responses.named[payload.name] = payload.result;
           });
         }
       }

package/package.json

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

package/src/helpers/helpers.d.ts

@@ -60,5 +60,5 @@ declare function extractFieldKeys(expression: string): {
  * // expressions will contain an array of objects with origin expressions, field keys, and destination paths.
  * ```
  */
-declare function traverseObject(obj: any, path?: string): TSubscribedTemplates[];
+declare function traverseObject(element: any, path?: string): TSubscribedTemplates[];
 export { makeRequest, traverseObject, extractFieldKeys };

package/src/types/schema.d.ts

@@ -311,6 +311,8 @@ type TDateValidation = {
  *
  * @property {number} [max] - Maximum value or length.
  * @property {number} [min] - Minimum value or length.
+ * @property {number} [lessThan] - Minimum value or length.
+ * @property {number} [greaterThan] - Minimum value or length.
  * @property {TLengthValidation} [length] - Length validation rule.
  * @property {boolean} [required] - Indicates if the field is required.
  * @property {unknown} [value] - Specific value to match.
@@ -344,6 +346,8 @@ type TDateValidation = {
  * const validationMethods: TValidationMethods = {
  *   max: 100,
  *   min: 1,
+ *   lessThan: 1995,
+ *   greaterThan: 82000,
  *   length: { rule: 'greaterOrEqual', target: 8 },
  *   required: true,
  *   regex: '^[a-zA-Z0-9]+$',
@@ -394,6 +398,8 @@ type TDateValidation = {
 type TValidationMethods = {
     max?: number;
     min?: number;
+    lessThan?: number;
+    greaterThan?: number;
     length?: TLengthValidation;
     required?: boolean;
     value?: unknown;

package/src/validations/number.d.ts

@@ -80,6 +80,36 @@ export declare const min: (value: unknown, validations: TValidationMethods) => b
  * ```
  */
 export declare const between: (value: unknown, validations: TValidationMethods) => boolean;
+/**
+ * Checks if a given value is less than a specified threshold.
+ *
+ * @param value - The value to be checked. This value will be converted to a number.
+ * @param validations - An object containing validation methods, specifically the `lessThan` property which holds the threshold value.
+ * @returns Returns `false` if the `lessThan` threshold is not provided or if the value is not a valid number. Otherwise, returns `true` if the value is greater than or equal to the `lessThan` threshold.
+ *
+ * @example
+ * ```typescript
+ * const validations = { lessThan: 10 };
+ * console.log(lessThan(5, validations)); // true
+ * console.log(lessThan(15, validations)); // false
+ * ```
+ */
+export declare const lessThan: (value: unknown, validations: TValidationMethods) => boolean;
+/**
+ * Checks if a given value is greater than a specified threshold.
+ *
+ * @param value - The value to be checked. This value will be converted to a number.
+ * @param validations - An object containing validation methods, specifically the `greaterThan` property which holds the threshold value.
+ * @returns Returns `false` if the `greaterThan` threshold is not provided or if the value is not a valid number. Otherwise, returns `true` if the value is less than or equal to the `greaterThan` threshold.
+ *
+ * @example
+ * ```typescript
+ * const validations = { greaterThan: 10 };
+ * console.log(greaterThan(15, validations)); // true
+ * console.log(greaterThan(5, validations)); // false
+ * ```
+ */
+export declare const greaterThan: (value: unknown, validations: TValidationMethods) => boolean;
 /**
  * Validates if a value contains sequential numbers.
  *