From 4c64bddea906943a0c3ca4cce7f372e2038eae0f Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Thu, 30 Nov 2023 13:47:04 -0300
Subject: [PATCH] fix(basic.gblib): Databases. #392 @othonlima.

---
 packages/basic.gblib/services/KeywordsExpressions.ts | 2 +-
 packages/basic.gblib/services/SystemKeywords.ts      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/basic.gblib/services/KeywordsExpressions.ts b/packages/basic.gblib/services/KeywordsExpressions.ts
index 4360225b..980e8c27 100644
--- a/packages/basic.gblib/services/KeywordsExpressions.ts
+++ b/packages/basic.gblib/services/KeywordsExpressions.ts
@@ -610,7 +610,7 @@ export class KeywordsExpressions {
     ];
 
     keywords[i++] = [
-      /^\s*(wait)\s*(\d+)/gim,
+      /^\s*(wait)\s*(.*)/gim,
       ($0, $1, $2) => {
         return `await sys.wait({pid: pid, seconds:${$2}})`;
       }
diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts
index cd584fb9..c37e3657 100644
--- a/packages/basic.gblib/services/SystemKeywords.ts
+++ b/packages/basic.gblib/services/SystemKeywords.ts
@@ -1938,6 +1938,12 @@ export class SystemKeywords {
   public async merge({ pid, file, data, key1, key2 }): Promise<any> {
 
     GBLog.info(`BASIC: MERGE running on ${file} and key1: ${key1}, key2: ${key2}...`);
+
+    if (!data){
+      GBLog.info(`BASIC: MERGE running on ${file}: NO DATA.`);
+      return data;
+    }
+
     const { min, user, params } = await DialogKeywords.getProcessInfo(pid);
 
     // Check if is a tree or flat object.