diff --git a/src/services/search/expressions/and.js b/src/services/search/expressions/and.js index 3d510ac25..e853318b9 100644 --- a/src/services/search/expressions/and.js +++ b/src/services/search/expressions/and.js @@ -1,7 +1,7 @@ "use strict"; const Expression = require('./expression'); -const TrueExp = require('./true.js'); +const TrueExp = require('./true'); class AndExp extends Expression { static of(subExpressions) { diff --git a/src/services/search/expressions/or.js b/src/services/search/expressions/or.js index 529320724..adf9b4fe3 100644 --- a/src/services/search/expressions/or.js +++ b/src/services/search/expressions/or.js @@ -2,7 +2,7 @@ const Expression = require('./expression'); const NoteSet = require('../note_set'); -const TrueExp = require('./true.js'); +const TrueExp = require('./true'); class OrExp extends Expression { static of(subExpressions) { diff --git a/src/services/search/expressions/true.js b/src/services/search/expressions/true.js deleted file mode 100644 index fd685cc17..000000000 --- a/src/services/search/expressions/true.js +++ /dev/null @@ -1,11 +0,0 @@ -"use strict"; - -const Expression = require('./expression'); - -class TrueExp extends Expression { - execute(inputNoteSet, executionContext, searchContext) { - return inputNoteSet; - } -} - -module.exports = TrueExp; diff --git a/src/services/search/expressions/true.ts b/src/services/search/expressions/true.ts new file mode 100644 index 000000000..a53d1afde --- /dev/null +++ b/src/services/search/expressions/true.ts @@ -0,0 +1,14 @@ +"use strict"; + +import NoteSet = require("../note_set"); +import SearchContext = require("../search_context"); + +import Expression = require('./expression'); + +class TrueExp extends Expression { + execute(inputNoteSet: NoteSet, executionContext: {}, searchContext: SearchContext): NoteSet { + return inputNoteSet; + } +} + +export = TrueExp; diff --git a/src/services/search/services/parse.js b/src/services/search/services/parse.js index 17f0844ca..9edb4bb87 100644 --- a/src/services/search/services/parse.js +++ b/src/services/search/services/parse.js @@ -18,7 +18,7 @@ const AncestorExp = require('../expressions/ancestor'); const buildComparator = require('./build_comparator.js'); const ValueExtractor = require('../value_extractor'); const utils = require('../../utils'); -const TrueExp = require('../expressions/true.js'); +const TrueExp = require('../expressions/true'); const IsHiddenExp = require('../expressions/is_hidden.js'); function getFulltext(tokens, searchContext) {