query filter : renames match argument field names

generate_data/populate.js

@@ -125,4 +125,49 @@ fragment FollowFrag on Follows {
   }
 }
 
- */
\ No newline at end of file
+ */
+
+
+/**
+ {
+ graph(query:{User:{_or:[{username:{_gt:"Y"}},{username:{_eq:"Aaliyah.Berge46"}}]}}) {
+   ... on User {
+     ...UserFrag
+   }
+ }
+}
+
+fragment UserFrag on User {
+ username
+ followsAndKnows: _rel {
+   # ... on Follows {
+   #   ...FollowFrag
+   # }
+   ... on Knows {
+     _obj (query:{User:{username:{_lt:"B"}}}){
+       ... on User {
+         username
+       }
+     }
+   }
+ }
+}
+
+# fragment FollowFrag on Follows {
+#   user: _obj {
+#     ... on User {
+#       username
+#       knows: _rel {
+#         ... on Knows {
+#           knows: _obj {
+#             ... on User {
+#               username
+#             }
+#           }
+#         }
+#       }
+#     }
+#   }
+# }
+
+*/
\ No newline at end of file

src/gql-graph/mongo/buildMongoPipeline.ts

@@ -32,7 +32,7 @@ export const buildMongoPipeline = (docS: DocumentSelection, notTop?: boolean) =>
 
       field.lookups.forEach((fieldLookup, index) => {
         const $match = { $and: [{ __typename: fieldLookup.__typename }] as any[] }
-        fieldLookup.match && $match.$and.push(fieldLookup.match)
+        fieldLookup.match && $match.$and.push(renameMatchFields(fieldLookup.match))
 
         if (!index) {
           mainLookup.pipeline = [
@@ -71,3 +71,18 @@ export const buildMongoPipeline = (docS: DocumentSelection, notTop?: boolean) =>
   //   return stages
   // }
 }
+
+function renameMatchFields(match: any): any {
+  if (Array.isArray(match)) {
+    return match.map((_) => renameMatchFields(_))
+  } else if ('object' === typeof match) {
+    return Object.entries(match).reduce((_, [key, val]) => {
+      return {
+        ..._,
+        [key.replace(/^_/, '$')]: renameMatchFields(val),
+      }
+    }, {})
+  } else {
+    return match
+  }
+}