Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-15 09:45:52 +01:00
Code Issues Packages Projects Releases Activity

support for long syntax of labels and relations

Browse Source
This commit is contained in:
zadam
2020-05-23 18:13:35 +02:00
parent 355ffd3d02
commit ae772288e2
2 changed files with 123 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/services/search/parser.js
View File

@@ -52,18 +52,40 @@ function getExpression(tokens, parsingContext) {
i++;
if (tokens[i] === 'parent') {
if (tokens[i] === 'parents') {
i += 1;
return new ChildOfExp(parseNoteProperty());
}
if (tokens[i] === 'child') {
if (tokens[i] === 'children') {
i += 1;
return new ParentOfExp(parseNoteProperty());
}
if (tokens[i] === 'labels') {
if (tokens[i + 1] !== '.') {
parsingContext.addError(`Expected "." to separate field path, god "${tokens[i + 1]}"`);
return;
}
i += 2;
return parseLabel(tokens[i]);
}
if (tokens[i] === 'relations') {
if (tokens[i + 1] !== '.') {
parsingContext.addError(`Expected "." to separate field path, god "${tokens[i + 1]}"`);
return;
}
i += 2;
return parseRelation(tokens[i]);
}
if (tokens[i] === 'title') {
const propertyName = tokens[i];
const operator = tokens[i + 1];
@@ -81,6 +103,45 @@ function getExpression(tokens, parsingContext) {
}
}
function parseLabel(labelName) {
parsingContext.highlightedTokens.push(labelName);
if (i < tokens.length - 2 && isOperator(tokens[i + 1])) {
let operator = tokens[i + 1];
const comparedValue = tokens[i + 2];
parsingContext.highlightedTokens.push(comparedValue);
if (parsingContext.fuzzyAttributeSearch && operator === '=') {
operator = '*=*';
}
const comparator = comparatorBuilder(operator, comparedValue);
if (!comparator) {
parsingContext.addError(`Can't find operator '${operator}'`);
} else {
i += 2;
return new LabelComparisonExp('label', labelName, comparator);
}
} else {
return new AttributeExistsExp('label', labelName, parsingContext.fuzzyAttributeSearch);
}
}
function parseRelation(relationName) {
parsingContext.highlightedTokens.push(relationName);
if (i < tokens.length - 2 && tokens[i + 1] === '.') {
i += 1;
return new RelationWhereExp(relationName, parseNoteProperty());
} else {
return new AttributeExistsExp('relation', relationName, parsingContext.fuzzyAttributeSearch);
}
}
for (i = 0; i < tokens.length; i++) {
const token = tokens[i];
@@ -93,45 +154,13 @@ function getExpression(tokens, parsingContext) {
}
else if (token.startsWith('#')) {
const labelName = token.substr(1);
parsingContext.highlightedTokens.push(labelName);
if (i < tokens.length - 2 && isOperator(tokens[i + 1])) {
let operator = tokens[i + 1];
const comparedValue = tokens[i + 2];
parsingContext.highlightedTokens.push(comparedValue);
if (parsingContext.fuzzyAttributeSearch && operator === '=') {
operator = '*=*';
}
const comparator = comparatorBuilder(operator, comparedValue);
if (!comparator) {
parsingContext.addError(`Can't find operator '${operator}'`);
continue;
}
expressions.push(new LabelComparisonExp('label', labelName, comparator));
i += 2;
}
else {
expressions.push(new AttributeExistsExp('label', labelName, parsingContext.fuzzyAttributeSearch));
}
expressions.push(parseLabel(labelName));
}
else if (token.startsWith('~')) {
const relationName = token.substr(1);
parsingContext.highlightedTokens.push(relationName);
if (i < tokens.length - 2 && tokens[i + 1] === '.') {
i += 1;
expressions.push(new RelationWhereExp(relationName, parseNoteProperty()));
}
else {
expressions.push(new AttributeExistsExp('relation', relationName, parsingContext.fuzzyAttributeSearch));
}
expressions.push(parseRelation(relationName));
}
else if (token === 'note') {
i++;