fixed issue with parsing json (#31)

* fixed issue with parsing json
* improved parsing logic

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.1]
+- :beetle: fixed issue with parsing json
+
 ## [1.10.0]
 - :rocket: added export of Memory type
 - :beetle: fixed issue with nested curly braces

package-lock.json

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

package.json

@@ -64,12 +64,15 @@ class Memory {
      */
     @readonly
     getString(str: string): any {
-        const matches = this.extractExpressions(str).filter(match => PARSE_STRING_REGEXP.exec(match));
-        if (!matches) return str;
-        return matches
-            .map((match: string) => match.replace(/(^{|}$)/g, ``))
-            .reduce((str: string, variable: any) => str.replace(`{${variable}}`, this.getKey(variable)), str)
-            .replace(UNESCAPE_DOLLAR_REGEXP, '$');
+        const getFunction = new Function(
+            `return \`${str.replaceAll(`{$`, '${this.')}\``
+                .replace(UNESCAPE_DOLLAR_REGEXP, '$')
+        );
+        try {
+            return getFunction.apply(this.storage);
+        } catch (err: any) {
+            throw new MemoryError(err);
+        }
     }
 
     /**
@@ -93,7 +96,7 @@ class Memory {
     @readonly
     getKey(str: string): any {
         const getFunction = new Function(
-            `return ${str.replace(/\$/g, 'this.')}`
+            `return ${str.replaceAll('$', 'this.')}`
                 .replace(UNESCAPE_DOLLAR_REGEXP, '$')
         );
         try {
@@ -120,22 +123,6 @@ class Memory {
         this.logger = logger;
     }
 
-    private extractExpressions(text: string) {
-        const braces = [];
-        const stack = [];
-
-        for (let i = 0; i < text.length; i++) {
-            if (text[i] === '{') {
-                stack.push(i);
-            } else if (text[i] === '}' && stack.length > 0) {
-                const start = stack.pop();
-                braces.push(text.substring(start as number, i + 1));
-            }
-        }
-
-        return braces;
-    }
-
 }
 
 export default new Memory();

src/memory.ts

@@ -314,6 +314,10 @@ test('correct error message', () => {
     expect(() => memory.getValue('$x()')).toThrow('$x is not a function');
 });
 
+test('correct error message in template string', () => {
+    expect(() => memory.getValue('{$x()}')).toThrow('$x is not a function');
+});
+
 test('getter', () => {
     let closure = 1;
     memory.register({
@@ -328,6 +332,11 @@ test('escape curly braces', () => {
     expect(memory.getValue('template {$fn("{inner value}")}')).to.equal('template inner value');
 });
 
+test('resolve json', () => {
+    memory.setValue('randomName', (text: string) => 'random');
+    const json = `{"email": "{$randomName(6)}+{$randomName(6)}"}`
+    expect(memory.getValue(json)).to.equal('{"email": "random+random"}');
+});
 
 
 

tests/memory.spec.ts

@@ -6,7 +6,7 @@
     "test/**/*.spec.ts"
   ],
   "compilerOptions": {
-    "target": "es2017",
+    "target": "es2021",
     "module": "node16",
     "moduleResolution": "node16",
     "outDir": "./lib",