From ccc51e012368cb8b01ce6c3f537ccb50d0503214 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 18 Feb 2024 00:46:14 +0200 Subject: [PATCH] server-ts: Port services/search/expressions/child_of --- .../expressions/{child_of.js => child_of.ts} | 14 +++++++++----- src/services/search/services/parse.js | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) rename src/services/search/expressions/{child_of.js => child_of.ts} (68%) diff --git a/src/services/search/expressions/child_of.js b/src/services/search/expressions/child_of.ts similarity index 68% rename from src/services/search/expressions/child_of.js rename to src/services/search/expressions/child_of.ts index bbfc4a6ef..10d31c00a 100644 --- a/src/services/search/expressions/child_of.js +++ b/src/services/search/expressions/child_of.ts @@ -1,16 +1,20 @@ "use strict"; -const Expression = require('./expression'); -const NoteSet = require('../note_set'); +import Expression = require('./expression'); +import NoteSet = require('../note_set'); +import SearchContext = require('../search_context'); class ChildOfExp extends Expression { - constructor(subExpression) { + + private subExpression: Expression; + + constructor(subExpression: Expression) { super(); this.subExpression = subExpression; } - execute(inputNoteSet, executionContext, searchContext) { + execute(inputNoteSet: NoteSet, executionContext: {}, searchContext: SearchContext) { const subInputNoteSet = new NoteSet(); for (const note of inputNoteSet.notes) { @@ -33,4 +37,4 @@ class ChildOfExp extends Expression { } } -module.exports = ChildOfExp; +export = ChildOfExp; diff --git a/src/services/search/services/parse.js b/src/services/search/services/parse.js index 3f67e8bc8..0b2641343 100644 --- a/src/services/search/services/parse.js +++ b/src/services/search/services/parse.js @@ -4,7 +4,7 @@ const dayjs = require("dayjs"); const AndExp = require('../expressions/and'); const OrExp = require('../expressions/or.js'); const NotExp = require('../expressions/not.js'); -const ChildOfExp = require('../expressions/child_of.js'); +const ChildOfExp = require('../expressions/child_of'); const DescendantOfExp = require('../expressions/descendant_of.js'); const ParentOfExp = require('../expressions/parent_of.js'); const RelationWhereExp = require('../expressions/relation_where.js');