add the Expression Document Operation to add custom JS execution

Author: Axel77g

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-aggregate",
   "author": "Axel77g",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module",
   "scripts": {
     "dev": "tsc --watch --resolveJsonModule",

src/documentOperations/Expression.ts

@@ -0,0 +1,14 @@
+import { DocumentOperationInt } from "../core/DocumentOperationInt";
+import { CollectionDocument } from "../core/CollectionDocument";
+
+type ExpressionCallback = (document: CollectionDocument) => Promise<any>;
+
+export class Expression implements DocumentOperationInt {
+  private readonly callback: ExpressionCallback;
+  constructor(callback: ExpressionCallback) {
+    this.callback = callback;
+  }
+  async execute(document: CollectionDocument): Promise<any> {
+    return this.callback(document);
+  }
+}

src/index.ts

@@ -20,6 +20,7 @@ export { DateToString } from "./documentOperations/DateToString";
 export { ToDate } from "./documentOperations/ToDate";
 export { Multiply } from "./documentOperations/Multiply";
 export { MergeObject } from "./documentOperations/MergeObject";
+export { Expression } from "./documentOperations/Expression";
 
 export async function aggregate(
   collection: Collection,

src/operations/Match.ts

@@ -1,6 +1,8 @@
 import { OperationInt } from "../core/OperationInt";
 import { Collection } from "../core/Collection";
 import { NestedResolver } from "../Utils/NetsedResolver";
+import { isDocumentOperationInt } from "../core/DocumentOperationInt";
+import { AggregateOperation } from "../core/AggregateOperation";
 
 export class Match implements OperationInt {
   private query: object;
@@ -13,9 +15,28 @@ export class Match implements OperationInt {
     for (const doc of collection) {
       let match = true;
       for (const key in this.query) {
-        const values = NestedResolver.getNestedValue(doc, key);
         // @ts-ignore
-        if (values !== this.query[key]) {
+        let targetValue = this.query[key];
+
+        if (targetValue instanceof AggregateOperation) {
+          const operation = targetValue.getOperation();
+          const args = targetValue.getArgs();
+          const operationInstance = new operation(...args);
+          if (isDocumentOperationInt(operationInstance)) {
+            targetValue = await operationInstance.execute(doc);
+          } else throw new Error("Operation is not a DocumentOperation");
+        }
+
+        const values = NestedResolver.getNestedValue(doc, key);
+
+        if (targetValue === true) {
+          if (!values) {
+            match = false;
+            break;
+          }
+          continue;
+        }
+        if (values !== targetValue) {
           match = false;
           break;
         }