@bolttech/form-engine-core 0.0.1-beta.41 → 0.0.1-beta.43

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;
 }
@@ -2448,6 +2434,7 @@ class FormField {
     mapper
   }) {
     var _a, _b, _c, _d, _e, _f, _g;
+    this.valueSubscription$ = new Subscription();
     this.fieldStateSubscription$ = new Subscription();
     this.originalSchema = schemaComponent;
     this.config = {
@@ -3014,6 +3001,7 @@ class FormCore {
    */
   constructor(entry) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    this.templateSubscription$ = new Subscription();
     this.mappers = new Map();
     this.schema = entry.schema;
     this.fields = new Map();
@@ -3037,7 +3025,7 @@ class FormCore {
     this.subscribedTemplates = [];
     this.schema && this.serializeStructure(this.schema.components);
     this.schema && this.subscribeTemplates();
-    this.templateSubscription = this.templateSubject$.subscribe(this.refreshTemplates.bind(this));
+    this.templateSubscription$ = this.templateSubject$.subscribe(this.refreshTemplates.bind(this));
     this.templateSubject$.next({
       key: IVARPROPNAME,
       event: 'ON_IVARS'
@@ -3673,7 +3661,7 @@ class FormCore {
   }
   destroy() {
     this.submitSubject$.unsubscribe();
-    this.templateSubscription.unsubscribe();
+    this.templateSubscription$.unsubscribe();
     this.fieldEventSubject$.unsubscribe();
     this.dataSubject$.unsubscribe();
     this.fields.forEach(field => field.destroyField());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bolttech/form-engine-core",
-  "version": "0.0.1-beta.41",
+  "version": "0.0.1-beta.43",
   "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/managers/form.d.ts

@@ -18,7 +18,7 @@ declare class FormCore {
         key: string;
         event: TMutationEvents;
     }>;
-    templateSubscription: Subscription;
+    templateSubscription$: Subscription;
     submitSubject$: Subject<TFormValues<any>>;
     mountSubject$: Subject<TFormValues<any>>;
     fieldEventSubject$: Subject<TFieldEvent>;