From 13f9bb3e764e9535e1ac75e94ad17151fe6ecb51 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Thu, 26 Nov 2020 10:24:55 -0300 Subject: [PATCH] fix(core.gbapp): Now and Today are now OK. --- packages/core.gbapp/services/GBVMService.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/core.gbapp/services/GBVMService.ts b/packages/core.gbapp/services/GBVMService.ts index d0b7c66d..2c417d4c 100644 --- a/packages/core.gbapp/services/GBVMService.ts +++ b/packages/core.gbapp/services/GBVMService.ts @@ -320,10 +320,12 @@ export class GBVMService extends GBService { code = parsedCode; } + + parsedCode = this.handleThisAndAwait(parsedCode); - parsedCode = parsedCode.replace(/(now)(?=(?:[^"]|"[^"]*")*$)/, 'await this.getNow(step)'); - parsedCode = parsedCode.replace(/(today)(?=(?:[^"]|"[^"]*")*$)/, 'await this.getToday(step)'); + parsedCode = parsedCode.replace(/(now)(?=(?:[^"]|"[^"]*")*$)/gi, 'await this.getNow(step)'); + parsedCode = parsedCode.replace(/(today)(?=(?:[^"]|"[^"]*")*$)/gi, 'await this.getToday(step)'); parsedCode = beautify(parsedCode, { indent_size: 2, space_in_empty_paren: true }); fs.writeFileSync(jsfile, parsedCode);