server-ts: Port services/search/expressions/expression

src/services/search/expressions/ancestor.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const log = require('../../log');
 const becca = require('../../../becca/becca');

src/services/search/expressions/and.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const TrueExp = require('./true.js');
 
 class AndExp extends Expression {

src/services/search/expressions/attribute_exists.js

@@ -2,7 +2,7 @@
 
 const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 
 class AttributeExistsExp extends Expression {
     constructor(attributeType, attributeName, prefixMatch) {

src/services/search/expressions/child_of.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 
 class ChildOfExp extends Expression {

src/services/search/expressions/descendant_of.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
 

src/services/search/expressions/expression.ts

@@ -1,6 +1,11 @@
 "use strict";
 
-class Expression {
+import NoteSet = require("../note_set");
+import SearchContext = require("../search_context");
+
+abstract class Expression {
+    name: string;
+
     constructor() {
         this.name = this.constructor.name; // for DEBUG mode to have expression name as part of dumped JSON
     }
@@ -11,7 +16,7 @@ class Expression {
      * @param {SearchContext} searchContext
      * @returns {NoteSet}
      */
-    execute(inputNoteSet, executionContext, searchContext) {}
+    abstract execute(inputNoteSet: NoteSet, executionContext: {}, searchContext: SearchContext): NoteSet;
 }
 
-module.exports = Expression;
+export = Expression;

src/services/search/expressions/is_hidden.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 
 /**

src/services/search/expressions/label_comparison.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
 

src/services/search/expressions/not.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 
 class NotExp extends Expression {
     constructor(subExpression) {

src/services/search/expressions/note_content_fulltext.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const log = require('../../log');
 const becca = require('../../../becca/becca');

src/services/search/expressions/note_flat_text.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
 const utils = require('../../utils');

src/services/search/expressions/or.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const TrueExp = require('./true.js');
 

src/services/search/expressions/order_by_and_limit.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 
 class OrderByAndLimitExp extends Expression {

src/services/search/expressions/parent_of.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 
 class ParentOfExp extends Expression {

src/services/search/expressions/property_comparison.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const buildComparator = require('../services/build_comparator.js');
 

src/services/search/expressions/relation_where.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 const NoteSet = require('../note_set');
 const becca = require('../../../becca/becca');
 

src/services/search/expressions/true.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const Expression = require('./expression.js');
+const Expression = require('./expression');
 
 class TrueExp extends Expression {
     execute(inputNoteSet, executionContext, searchContext) {