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

fix(basic.gblib): update ChatServices.ts #420

Closed
eltociear wants to merge 2540 commits from patch-1 into main
pull from: patch-1
merge into: GeneralBots:main
Conversation 1 Commits 2540 Files changed 292 +7
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 015bfb74e8 - Show all commits

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

@ -1088,6 +1088,13 @@ 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++] = [ keywords[i++] = [
/^\s*MERGE\s+(.*)\s*WITH\s*(.*)BY\s*(.*)/gim, /^\s*MERGE\s+(.*)\s*WITH\s*(.*)BY\s*(.*)/gim,
($0, $1, $2, $3) => { ($0, $1, $2, $3) => {