Fix replaceVariablesInObj bug

src/utils/data-utils.ts

@@ -14,27 +14,24 @@ export class DataUtils {
  jsonValue: any,
  variables: { [name: string]: string }
  ): any {
- for (let key in jsonValue) {
- // "for ... in" loops over all properties, including prototypes
- // So we need to check if this property belong to only the object
- if (!jsonValue.hasOwnProperty(key)) {
- continue;
- }
-
- switch (typeof jsonValue[key]) {
- case 'object': {
- this.replaceVariablesInObj(jsonValue[key], variables);
- break;
- }
- case 'string': {
- jsonValue[key] = this.replaceVariables(jsonValue[key], variables);
- break;
- }
- default: {
- continue;
+ switch (typeof jsonValue) {
+ case 'object': {
+ for (let key in jsonValue) {
+ // "for ... in" loops over all properties, including prototypes
+ // So we need to check if this property belong to only the object
+ if (!jsonValue.hasOwnProperty(key)) {
+ continue;
+ }
+ jsonValue[key] = this.replaceVariablesInObj(jsonValue[key], variables);
  }
+ break;
+ }
+ case 'string': {
+ jsonValue = this.replaceVariables(jsonValue, variables);
+ break;
  }
  }
+
  return jsonValue;
  }
 

tests/unit/utils/data-utils.test.ts

@@ -23,5 +23,12 @@ describe('DataUtils', (): void => {
  '{"test":"HELLO","nested":{"test":"HELLO"},"array":["HELLO","HELLO"],"mixedArray":["HELLO",true,5],"inside":"Before HELLO After","number":5,"boolean":true,"null":null}'
  );
  });
+
+ it('String example', (): void => {
+ let myString = DataUtils.replaceVariablesInObj('Before {{MY_VARIABLE}} After', {
+ MY_VARIABLE: 'HELLO',
+ });
+ expect(myString).to.equal('Before HELLO After');
+ });
  });
 });