Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

server-ts: Port services/search/expressions/or

Browse Source
This commit is contained in:
Elian Doran
2024-02-18 01:06:42 +02:00
parent 460982d290
commit c63d05b582
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/services/search/expressions/or.js → src/services/search/expressions/or.ts
View File

@@ -1,11 +1,14 @@
"use strict";
const Expression = require('./expression');
const NoteSet = require('../note_set');
const TrueExp = require('./true');
import Expression = require('./expression');
import NoteSet = require('../note_set');
import TrueExp = require('./true');
import SearchContext = require('../search_context');
class OrExp extends Expression {
static of(subExpressions) {
private subExpressions: Expression[];
static of(subExpressions: Expression[]) {
subExpressions = subExpressions.filter(exp => !!exp);
if (subExpressions.length === 1) {
@@ -19,13 +22,13 @@ class OrExp extends Expression {
}
}
constructor(subExpressions) {
constructor(subExpressions: Expression[]) {
super();
this.subExpressions = subExpressions;
}
execute(inputNoteSet, executionContext, searchContext) {
execute(inputNoteSet: NoteSet, executionContext: {}, searchContext: SearchContext) {
const resultNoteSet = new NoteSet();
for (const subExpression of this.subExpressions) {
@@ -36,4 +39,4 @@ class OrExp extends Expression {
}
}
module.exports = OrExp;
export = OrExp;

2
src/services/search/services/parse.js
View File

@@ -2,7 +2,7 @@
const dayjs = require("dayjs");
const AndExp = require('../expressions/and');
const OrExp = require('../expressions/or.js');
const OrExp = require('../expressions/or');
const NotExp = require('../expressions/not');
const ChildOfExp = require('../expressions/child_of');
const DescendantOfExp = require('../expressions/descendant_of');