From d5bcf5f3038a762411dd7196488973324096669f Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Sun, 11 Feb 2024 02:00:28 -0300
Subject: [PATCH] fix(basic.gblib): Allow MERGE keyword in storage #386.
 @othonlima

---
 .../basic.gblib/services/KeywordsExpressions.ts   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/packages/basic.gblib/services/KeywordsExpressions.ts b/packages/basic.gblib/services/KeywordsExpressions.ts
index 53d438c0..37e26953 100644
--- a/packages/basic.gblib/services/KeywordsExpressions.ts
+++ b/packages/basic.gblib/services/KeywordsExpressions.ts
@@ -1089,28 +1089,21 @@ export class KeywordsExpressions {
     ];
 
     keywords[i++] = [
-      /^\s*((?:[a-z]+.?)(?:(?:\w+).)(?:\w+)*)\s*=\s*MERGE\s+(.*)\s*WITH\s*(.*)BY\s*(.*)/gim,
-      ($0, $1, $2, $3, $4) => {
-        return `${$1} = await sys.merge({pid: pid, file: ${$2}, data: ${$3}, key1: ${$4}})`;
-      }
-    ];
-
-    keywords[i++] = [
-      /^\s*MERGE\s+(.*)\s*WITH\s*(.*)BY\s*(.*)/gim,
+      /^\s*MERGE\s*(.*)\s*WITH\s*(.*)BY\s*(.*)/gim,
       ($0, $1, $2, $3) => {
         return `await sys.merge({pid: pid, file: ${$1}, data: ${$2}, key1: ${$3}})`;
       }
     ];
 
     keywords[i++] = [
-      /^\s*MERGE\s+(.*)/gim,
+      /^\s*MERGE(\s*)(.*)/gim,
       ($0, $1, $2, $3) => {
-        return `await img.mergeImage({pid: pid, files: [${$2}]})`;
+        return `await img.mergeImage({pid: pid, files: [${$3}]})`;
       }
     ];
 
     keywords[i++] = [
-      /^\s*PRESS\s+(.*)/gim,
+      /^\s*PRESS\s*(.*)/gim,
       ($0, $1, $2) => {
         return `await wa.pressKey({pid: pid, handle: page, char: ${$1}})`;
       }