GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(basic.gblib): Allow MERGE keyword in storage #386. @othonlima

Browse source
This commit is contained in:
Rodrigo Rodriguez 2024-02-11 02:00:28 -03:00
parent 015bfb74e8
commit d5bcf5f303
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/basic.gblib/services/KeywordsExpressions.ts
View file

@ -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}})`;
}