From 35886c3b0025f9f6cd03aab29437551fc71c52b1 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 18 Feb 2024 00:47:25 +0200 Subject: [PATCH] server-ts: Port services/search/expressions/descendant_of --- .../{descendant_of.js => descendant_of.ts} | 15 +++++++++------ src/services/search/services/parse.js | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) rename src/services/search/expressions/{descendant_of.js => descendant_of.ts} (58%) diff --git a/src/services/search/expressions/descendant_of.js b/src/services/search/expressions/descendant_of.ts similarity index 58% rename from src/services/search/expressions/descendant_of.js rename to src/services/search/expressions/descendant_of.ts index 918bd352e..6994056c8 100644 --- a/src/services/search/expressions/descendant_of.js +++ b/src/services/search/expressions/descendant_of.ts @@ -1,17 +1,20 @@ "use strict"; -const Expression = require('./expression'); -const NoteSet = require('../note_set'); -const becca = require('../../../becca/becca'); +import Expression = require('./expression'); +import NoteSet = require('../note_set'); +import becca = require('../../../becca/becca'); +import SearchContext = require('../search_context'); class DescendantOfExp 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(Object.values(becca.notes)); const subResNoteSet = this.subExpression.execute(subInputNoteSet, executionContext, searchContext); @@ -25,4 +28,4 @@ class DescendantOfExp extends Expression { } } -module.exports = DescendantOfExp; +export = DescendantOfExp; diff --git a/src/services/search/services/parse.js b/src/services/search/services/parse.js index 0b2641343..4c4265dd2 100644 --- a/src/services/search/services/parse.js +++ b/src/services/search/services/parse.js @@ -5,7 +5,7 @@ const AndExp = require('../expressions/and'); const OrExp = require('../expressions/or.js'); const NotExp = require('../expressions/not.js'); const ChildOfExp = require('../expressions/child_of'); -const DescendantOfExp = require('../expressions/descendant_of.js'); +const DescendantOfExp = require('../expressions/descendant_of'); const ParentOfExp = require('../expressions/parent_of.js'); const RelationWhereExp = require('../expressions/relation_where.js'); const PropertyComparisonExp = require('../expressions/property_comparison.js');