fixed issue with calling functions in templates (#32)

Author: AlexGalichenko

CHANGELOG.MD

@@ -4,6 +4,9 @@ All notable changes to the "@qavajs/memory" will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [1.10.2]
+- :beetle: fixed issue with calling functions in templates
+
 ## [1.10.1]
 - :beetle: fixed issue with parsing json
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@qavajs/memory",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "memory package for @qavajs framework",
   "main": "index.js",
   "scripts": {

package.json

@@ -65,7 +65,7 @@ class Memory {
     @readonly
     getString(str: string): any {
         const getFunction = new Function(
-            `return \`${str.replaceAll(`{$`, '${this.')}\``
+            `return \`${str.replaceAll('$', 'this.').replaceAll('{this.', '${this.')}\``
                 .replace(UNESCAPE_DOLLAR_REGEXP, '$')
         );
         try {

src/memory.ts

@@ -338,6 +338,14 @@ test('resolve json', () => {
     expect(memory.getValue(json)).to.equal('{"email": "random+random"}');
 });
 
+test('resolve template with function', () => {
+    memory.setValue('x', (text: string) => text);
+    memory.setValue('y', 42);
+    const expression = 'text {$x($y)}';
+    expect(memory.getValue(expression)).to.equal('text 42');
+});
+
+