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 #380. @othonlima

Browse source
This commit is contained in:
Rodrigo Rodriguez 2024-01-06 22:21:11 -03:00
parent c726947d2a
commit de5b0a7acd
2 changed files with 48 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -420,6 +420,14 @@ export class KeywordsExpressions {
} }
]; ];
keywords[i++] = [
/^\s*(DEBUG)(\s*)(.*)/gim,
($0, $1, $2, $3 ) => {
const params = this.getParams($3, ['text']);
return `await sys.log ({pid: pid, ${params}})`;
}
];
keywords[i++] = [ keywords[i++] = [
/^\s*(.*)\=\s*(DIR)(\s*)(.*)/gim, /^\s*(.*)\=\s*(DIR)(\s*)(.*)/gim,
($0, $1, $2, $3, $4) => { ($0, $1, $2, $3, $4) => {

46
packages/basic.gblib/services/SystemKeywords.ts
View file

@ -800,7 +800,7 @@ export class SystemKeywords {
// Flattern JSON to a table. // Flattern JSON to a table.
data = this.flattenJSON(fieldsValues, {}, '_') data = this.flattenJSON(fieldsValues);
// Uppercases fields. // Uppercases fields.
@ -1646,7 +1646,7 @@ export class SystemKeywords {
return GBAdminService.getRndPassword(); return GBAdminService.getRndPassword();
} }
private flattenJSON(obj, res, extraKey, hierarchy = false) { private flattenJSON(obj, res = {}, separator = '_', parent = null) {
for (let key in obj) { for (let key in obj) {
if (typeof obj[key] === 'function') { if (typeof obj[key] === 'function') {
continue; continue;
@ -1655,7 +1655,7 @@ export class SystemKeywords {
// If not defined already add the flattened field. // If not defined already add the flattened field.
const newKey = `${hierarchy ? extraKey : ''}${key}`; const newKey = `${parent ? (parent + separator) : ''}${key}`;
if (!res[newKey]) { if (!res[newKey]) {
res[newKey] = obj[key]; res[newKey] = obj[key];
} }
@ -1664,7 +1664,7 @@ export class SystemKeywords {
} }
} else { } else {
obj[key] = this.flattenJSON(obj[key], res, `${key}${extraKey}`, true); obj[key] = this.flattenJSON(obj[key], res, separator, `${parent ? parent + separator : ''}${key}`);
}; };
}; };
return res; return res;
@ -2167,7 +2167,7 @@ export class SystemKeywords {
page++; page++;
count = paged.length; count = paged.length;
GBLog.info(`page: ${page}, cached: ${rows.length}.`); GBLog.info(`BASIC: MERGE cached: ${rows.length} from page: ${page}.`);
} }
}, },
@ -2266,7 +2266,7 @@ export class SystemKeywords {
let row = data[i]; let row = data[i];
if (hasSubObject(row)) { if (hasSubObject(row)) {
row = this.flattenJSON(row, {}, '_', false); row = this.flattenJSON(row);
} }
let found; let found;
@ -2641,4 +2641,38 @@ export class SystemKeywords {
return array; return array;
} }
public async log({ pid, text: obj }) {
const { min } = await DialogKeywords.getProcessInfo(pid);
let level = 0;
const mydump = (text, level) => {
var dumped_text = "";
var level_padding = "";
for (var j = 0; j < level + 1; j++) level_padding += " ";
if (typeof (text) == 'object') {
for (var item in text) {
var value = text[item];
if (typeof (value) == 'object') {
dumped_text += level_padding + "'" + item + "' ...\n";
dumped_text += mydump(value, level + 1);
} else {
dumped_text += level_padding + "'" + item + "' => \"" + value + "\"\n";
}
}
} else {
dumped_text = text + "(" + typeof (text) + ")";
}
return dumped_text;
};
GBLogEx.info(min, mydump(obj, level));
}
} }