gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-02-27 00:53:35 +01:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fix searching with orderby and parentheses / increased expression level (#8717)
Some checks are pending
Checks / main (push) Waiting to run
Details
CodeQL Advanced / Analyze (actions) (push) Waiting to run
Details
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Details
Dev / Test development (push) Waiting to run
Details
Dev / Build Docker image (push) Blocked by required conditions
Details
Dev / Check Docker build (Dockerfile) (push) Blocked by required conditions
Details
Dev / Check Docker build (Dockerfile.alpine) (push) Blocked by required conditions
Details
/ Check Docker build (Dockerfile) (push) Waiting to run
Details
/ Check Docker build (Dockerfile.alpine) (push) Waiting to run
Details
/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm64) (push) Blocked by required conditions
Details
/ Build Docker images (Dockerfile.alpine, ubuntu-latest, linux/amd64) (push) Blocked by required conditions
Details
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v7) (push) Blocked by required conditions
Details
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v8) (push) Blocked by required conditions
Details
/ Merge manifest lists (push) Blocked by required conditions
Details
playwright / E2E tests on linux-arm64 (push) Waiting to run
Details
playwright / E2E tests on linux-x64 (push) Waiting to run
Details

Browse Source
This commit is contained in:
Elian Doran 2026-02-22 12:34:59 +02:00 committed by GitHub
commit 56f796bf80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/server/src/services/search/services/parse.spec.ts
View File

@ -234,6 +234,32 @@ describe("Parser", () => {
expect(rootExp.limit).toBe(2);
expect(rootExp.subExpression).toBeInstanceOf(AndExp);
});
describe("orderBy with level > 0", () => {
it("and grouping parentheses should parse without error", () => {
const searchContext = new SearchContext();
const rootExp = parseInternal(
{
fulltextTokens: [],
expressionTokens: tokens(["#foo", "and" , ["#bar", "or", "#baz", ], "orderby", "#priority", "desc"]),
searchContext
}
);
expect(searchContext.error).toBeNull();
});
it("and not() should parse without error", () => {
const searchContext = new SearchContext();
const rootExp = parseInternal(
{
fulltextTokens: [],
expressionTokens: tokens(["#foo", "and" , "not", [ "#bar", "=", "baz" ], "orderby", "#priority", "desc"]) ,
searchContext
}
);
expect(searchContext.error).toBeNull();
});
});
});
describe("Invalid expressions", () => {

4
apps/server/src/services/search/services/parse.ts
View File

@ -361,7 +361,7 @@ function getExpression(tokens: TokenData[], searchContext: SearchContext, level
for (i = 0; i < tokens.length; i++) {
if (Array.isArray(tokens[i])) {
const expression = getExpression(tokens[i] as unknown as TokenData[], searchContext, level++);
const expression = getExpression(tokens[i] as unknown as TokenData[], searchContext, level + 1);
if (expression) {
expressions.push(expression);
}
@ -402,7 +402,7 @@ function getExpression(tokens: TokenData[], searchContext: SearchContext, level
}
const tokenArray = tokens[i] as unknown as TokenData[];
const expression = getExpression(tokenArray, searchContext, level++);
const expression = getExpression(tokenArray, searchContext, level + 1);
if (!expression) {
return;
}