Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-01 13:39:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

More Sieve parser improvements after doing 'if not' test

Browse source
This commit is contained in:
djmaze 2021-01-14 16:38:26 +01:00
parent 2786d0d959
commit 0aafce4214
4 changed files with 153 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

65
dev/Sieve/Grammar.js
View file

@ -49,33 +49,23 @@ class Comment extends StringType
*/
class Command
{
constructor(identifier, text = null)
constructor(identifier)
{
this.identifier = identifier;
this.arguments = [];
if (text) {
this.text = text;
}
this.commands = new Commands;
}
toString()
{
let result = this.identifier;
if ('anyof' === result || 'allof' === result) {
result += ' (\r\n\t' + Sieve.arrayToString(this.commands, ',\r\n\t') + '\r\n)';
if (this.arguments.length) {
result += Sieve.arrayToString(this.arguments, ' ');
}
if (this.commands.length) {
result += ' ' + this.commands.toString();
} else {
this.arguments.forEach(arg => {
if (Array.isArray(arg)) {
result += ' [' + arg.join(',') + ']';
} else {
result += ' ' + arg;
}
});
if (this.commands) {
result += ' {\r\n\t' + Sieve.arrayToString(this.commands, ';\r\n\t') + '\r\n}';
} else {
result += ';';
}
result += ';';
}
return result;
}
@ -96,24 +86,22 @@ class Command
}
}
/*
class Commands extends Array
{
toString()
{
return this.length
? '{\r\n\t' + Sieve.arrayToString(this, ';\r\n\t') + ';\r\n}'
: ';';
? '{\r\n\t' + Sieve.arrayToString(this, '\r\n\t') + '\r\n}'
: '{}';
}
push(value)
{
if (value instanceof Command) {
if (value instanceof Command || value instanceof Comment) {
super.push(value);
}
}
}
*/
class BracketComment extends Comment
{
@ -223,7 +211,7 @@ class MultiLine extends StringType
/**
* https://tools.ietf.org/html/rfc5228#section-2.9
* https://tools.ietf.org/html/rfc5228#section-5
*/
class Test
{
@ -250,15 +238,15 @@ class Test
*/
class TestList extends Array
{
constructor(identifier)
constructor()
{
super();
this.identifier = identifier; // allof / anyof
}
toString()
{
if (1 < this.length) {
// return '(\r\n\t' + Sieve.arrayToString(this, ',\r\n\t') + '\r\n)';
return '(' + this.join(', ') + ')';
}
return this.length ? this[0] : '';
@ -266,34 +254,13 @@ class TestList extends Array
push(value)
{
/*
if (!(value instanceof Command)) {
value = new Command($value);
if (!(value instanceof Test)) {
throw 'Not an instanceof Test';
}
*/
super.push(value);
}
}
TestList.fromString = list => {
let test,
obj = new TestList,
regex = RegExp('(?:^\\s*|\\s*,\\s*)(' + RegEx.IDENTIFIER + ')((?:\\s+' + RegEx.ARGUMENT + ')*)', 'g');
list = list.replace(/^[\r\n\t(]+/, '');
while ((test = regex.exec(list))) {
let command = new Sieve.Commands.Command(test[1]);
obj.push(command);
/*
if (\preg_match_all('@\\s+(' . RegEx.ARGUMENT . ')@', $test[2], $args, PREG_SET_ORDER)) {
foreach ($args as $arg) {
$command->arguments[] = $arg;
}
}
*/
}
return obj;
}
Sieve.Grammar = {
Command: Command,
BracketComment: BracketComment,