From acb31b621fe3b83049ed8fd514f25cbbcf278f9b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 18 Feb 2024 00:48:37 +0200 Subject: [PATCH] server-ts: Port services/search/expressions/is_hidden --- .../search/expressions/{is_hidden.js => is_hidden.ts} | 9 +++++---- src/services/search/services/parse.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) rename src/services/search/expressions/{is_hidden.js => is_hidden.ts} (62%) diff --git a/src/services/search/expressions/is_hidden.js b/src/services/search/expressions/is_hidden.ts similarity index 62% rename from src/services/search/expressions/is_hidden.js rename to src/services/search/expressions/is_hidden.ts index 9fb59cec3..81bef22b3 100644 --- a/src/services/search/expressions/is_hidden.js +++ b/src/services/search/expressions/is_hidden.ts @@ -1,13 +1,14 @@ "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'); /** * Note is hidden when all its note paths start in hidden subtree (i.e., the note is not cloned into visible tree) */ class IsHiddenExp extends Expression { - execute(inputNoteSet, executionContext, searchContext) { + execute(inputNoteSet: NoteSet, executionContext: {}, searchContext: SearchContext) { const resultNoteSet = new NoteSet(); for (const note of inputNoteSet.notes) { @@ -20,4 +21,4 @@ class IsHiddenExp extends Expression { } } -module.exports = IsHiddenExp; +export = IsHiddenExp; diff --git a/src/services/search/services/parse.js b/src/services/search/services/parse.js index 4c4265dd2..372f2c979 100644 --- a/src/services/search/services/parse.js +++ b/src/services/search/services/parse.js @@ -19,7 +19,7 @@ const buildComparator = require('./build_comparator.js'); const ValueExtractor = require('../value_extractor'); const utils = require('../../utils'); const TrueExp = require('../expressions/true'); -const IsHiddenExp = require('../expressions/is_hidden.js'); +const IsHiddenExp = require('../expressions/is_hidden'); function getFulltext(tokens, searchContext) { tokens = tokens.map(t => utils.removeDiacritic(t.token));