From c63d05b582b3ce837478b00f0fc5d25260287a10 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sun, 18 Feb 2024 01:06:42 +0200
Subject: [PATCH] server-ts: Port services/search/expressions/or

---
 .../search/expressions/{or.js => or.ts}         | 17 ++++++++++-------
 src/services/search/services/parse.js           |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename src/services/search/expressions/{or.js => or.ts} (62%)

diff --git a/src/services/search/expressions/or.js b/src/services/search/expressions/or.ts
similarity index 62%
rename from src/services/search/expressions/or.js
rename to src/services/search/expressions/or.ts
index adf9b4fe3..f89e9070e 100644
--- a/src/services/search/expressions/or.js
+++ b/src/services/search/expressions/or.ts
@@ -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;
diff --git a/src/services/search/services/parse.js b/src/services/search/services/parse.js
index e59b5a4d9..c60595de6 100644
--- a/src/services/search/services/parse.js
+++ b/src/services/search/services/parse.js
@@ -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');