Refinement of query type with a new filter type

generator/config/expressions.php

@@ -79,6 +79,10 @@
         'returnType' => Type\ExpressionInterface::class,
         'acceptedTypes' => [Type\ExpressionInterface::class, ...$bsonTypes['any']],
     ],
+    'filter' => [
+        'returnType' => Type\QueryFilterInterface::class,
+        'acceptedTypes' => [Type\QueryFilterInterface::class, ...$bsonTypes['any']],
+    ],
     'query' => [
         'returnType' => Type\QueryInterface::class,
         'acceptedTypes' => [Type\QueryInterface::class, ...$bsonTypes['object']],
@@ -112,6 +116,10 @@
         'implements' => [ResolvesToAny::class],
         'acceptedTypes' => ['string'],
     ],
+    'geometry' => [
+        'returnType' => Type\GeometryInterface::class,
+        'acceptedTypes' => [Type\GeometryInterface::class, ...$bsonTypes['object']],
+    ],
 
     // @todo add enum values
     'Granularity' => [
@@ -155,7 +163,4 @@
     'GeoPoint' => [
         'acceptedTypes' => [...$bsonTypes['object']],
     ],
-    'Geometry' => [
-        'acceptedTypes' => [...$bsonTypes['object']],
-    ],
 ];

generator/config/query/all.yaml

@@ -4,7 +4,7 @@ category:
     - 'Array Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/all/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches arrays that contain all elements specified in the query.

generator/config/query/bitsAllClear.yaml

@@ -4,7 +4,7 @@ category:
     - 'Bitwise Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/bitsAllClear/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches numeric or binary values in which a set of bit positions all have a value of 0.

generator/config/query/bitsAllSet.yaml

@@ -4,7 +4,7 @@ category:
     - 'Bitwise Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/bitsAllSet/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches numeric or binary values in which a set of bit positions all have a value of 1.

generator/config/query/bitsAnyClear.yaml

@@ -4,7 +4,7 @@ category:
     - 'Bitwise Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/bitsAnyClear/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches numeric or binary values in which any bit from a set of bit positions has a value of 0.

generator/config/query/bitsAnySet.yaml

@@ -4,7 +4,7 @@ category:
     - 'Bitwise Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/bitsAnySet/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches numeric or binary values in which any bit from a set of bit positions has a value of 1.

generator/config/query/box.yaml

@@ -4,7 +4,7 @@ category:
     - 'Geospatial Geometry Specifiers'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/box/'
 type:
-    - query
+    - geometry
 encode: single
 description: |
     Specifies a rectangular box using legacy coordinate pairs for $geoWithin queries. The 2d index supports $box.

generator/config/query/center.yaml

@@ -4,7 +4,7 @@ category:
     - 'Geospatial Geometry Specifiers'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/center/'
 type:
-    - query
+    - geometry
 encode: single
 description: |
     Specifies a circle using legacy coordinate pairs to $geoWithin queries when using planar geometry. The 2d index supports $center.

generator/config/query/centerSphere.yaml

@@ -4,7 +4,7 @@ category:
     - 'Geospatial Geometry Specifiers'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/centerSphere/'
 type:
-    - query
+    - geometry
 encode: single
 description: |
     Specifies a circle using either legacy coordinate pairs or GeoJSON format for $geoWithin queries when using spherical geometry. The 2dsphere and 2d indexes support $centerSphere.

generator/config/query/elemMatch.yaml

@@ -4,7 +4,7 @@ category:
     - 'Projection Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/elemMatch/'
 type:
-    - query
+    - filter
     - projection
 encode: object
 description: |

generator/config/query/eq.yaml

@@ -4,7 +4,7 @@ category:
     - 'Comparison Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/eq/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches values that are equal to a specified value.

generator/config/query/exists.yaml

@@ -4,7 +4,7 @@ category:
     - 'Element Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/exists/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches documents that have the specified field.

generator/config/query/expr.yaml

@@ -4,7 +4,7 @@ category:
     - 'Evaluation Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/expr/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Allows use of aggregation expressions within the query language.

generator/config/query/geoIntersects.yaml

@@ -4,12 +4,12 @@ category:
     - 'Geospatial Query Selectors'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/geoIntersects/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Selects geometries that intersect with a GeoJSON geometry. The 2dsphere index supports $geoIntersects.
 arguments:
     -
         name: geometry
         type:
-            - Geometry
+            - geometry

generator/config/query/geoWithin.yaml

@@ -4,12 +4,12 @@ category:
     - 'Geospatial Query Selectors'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/geoWithin/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Selects geometries within a bounding GeoJSON geometry. The 2dsphere and 2d indexes support $geoWithin.
 arguments:
     -
         name: geometry
         type:
-            - Geometry
+            - geometry

generator/config/query/geometry.yaml

@@ -4,7 +4,7 @@ category:
     - 'Geospatial Geometry Specifiers'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/geometry/'
 type:
-    - query
+    - geometry
 encode: object
 description: |
     Specifies a geometry in GeoJSON format to geospatial query operators.

generator/config/query/gt.yaml

@@ -4,7 +4,7 @@ category:
     - 'Comparison Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/gt/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches values that are greater than a specified value.

generator/config/query/gte.yaml

@@ -4,7 +4,7 @@ category:
     - 'Comparison Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/gte/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches values that are greater than or equal to a specified value.

generator/config/query/in.yaml

@@ -4,7 +4,7 @@ category:
     - 'Comparison Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/in/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches any of the values specified in an array.

generator/config/query/lt.yaml

@@ -4,7 +4,7 @@ category:
     - 'Comparison Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/lt/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches values that are less than a specified value.

generator/config/query/lte.yaml

@@ -4,7 +4,7 @@ category:
     - 'Comparison Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/lte/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches values that are less than or equal to a specified value.

generator/config/query/maxDistance.yaml

@@ -4,7 +4,7 @@ category:
     - 'Geospatial Geometry Specifiers'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/maxDistance/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Specifies a maximum distance to limit the results of $near and $nearSphere queries. The 2dsphere and 2d indexes support $maxDistance.

generator/config/query/minDistance.yaml

@@ -4,7 +4,7 @@ category:
     - 'Geospatial Geometry Specifiers'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/minDistance/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Specifies a minimum distance to limit the results of $near and $nearSphere queries. For use with 2dsphere index only.

generator/config/query/mod.yaml

@@ -4,7 +4,7 @@ category:
     - 'Evaluation Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/mod/'
 type:
-    - query
+    - filter
 encode: array
 description: |
     Performs a modulo operation on the value of a field and selects documents with a specified result.

generator/config/query/ne.yaml

@@ -4,7 +4,7 @@ category:
     - 'Comparison Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/ne/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches all values that are not equal to a specified value.

generator/config/query/near.yaml

@@ -4,15 +4,15 @@ category:
     - 'Geospatial Query Selectors'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/near/'
 type:
-    - query
+    - filter
 encode: object
 description: |
     Returns geospatial objects in proximity to a point. Requires a geospatial index. The 2dsphere and 2d indexes support $near.
 arguments:
     -
         name: geometry
         type:
-            - Geometry
+            - geometry
     -
         name: maxDistance
         type:

generator/config/query/nearSphere.yaml

@@ -4,15 +4,15 @@ category:
     - 'Geospatial Query Selectors'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/nearSphere/'
 type:
-    - query
+    - filter
 encode: object
 description: |
     Returns geospatial objects in proximity to a point on a sphere. Requires a geospatial index. The 2dsphere and 2d indexes support $nearSphere.
 arguments:
     -
         name: geometry
         type:
-            - Geometry
+            - geometry
     -
         name: maxDistance
         type:

generator/config/query/nin.yaml

@@ -4,7 +4,7 @@ category:
     - 'Comparison Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/nin/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Matches none of the values specified in an array.

generator/config/query/not.yaml

@@ -4,7 +4,7 @@ category:
     - 'Logical Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/not/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Inverts the effect of a query expression and returns documents that do not match the query expression.
@@ -13,3 +13,4 @@ arguments:
         name: expression
         type:
             - query
+            - regex

generator/config/query/polygon.yaml

@@ -4,7 +4,7 @@ category:
     - 'Geospatial Geometry Specifiers'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/polygon/'
 type:
-    - query
+    - geometry
 encode: single
 description: |
     Specifies a polygon to using legacy coordinate pairs for $geoWithin queries. The 2d index supports $center.

generator/config/query/regex.yaml

@@ -4,7 +4,7 @@ category:
     - 'Evaluation Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/regex/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Selects documents where values match a specified regular expression.

generator/config/query/size.yaml

@@ -4,7 +4,7 @@ category:
     - 'Array Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/size/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Selects documents if the array field is a specified size.

generator/config/query/slice.yaml

@@ -2,9 +2,8 @@
 name: $slice
 category:
     - 'Projection Operators'
-link: 'https://www.mongodb.com/docs/manual/reference/operator/query/slice/'
+link: 'https://www.mongodb.com/docs/manual/reference/operator/projection/slice/'
 type:
-    - query
     - projection
 encode: array
 description: |

generator/config/query/type.yaml

@@ -4,7 +4,7 @@ category:
     - 'Element Query Operators'
 link: 'https://www.mongodb.com/docs/manual/reference/operator/query/type/'
 type:
-    - query
+    - filter
 encode: single
 description: |
     Selects documents if a field is of the specified type.

generator/config/schema.json

@@ -35,7 +35,9 @@
                             "projection",
                             "stage",
                             "query",
+                            "filter",
                             "window",
+                            "geometry",
                             "resolvesToAny",
                             "resolvesToNumber",
                             "resolvesToDouble",
@@ -110,6 +112,8 @@
                             "pipeline",
                             "window",
                             "expression",
+                            "geometry",
+                            "any",
                             "resolvesToNumber", "numberFieldPath", "number",
                             "resolvesToDouble", "doubleFieldPath", "double",
                             "resolvesToString", "stringFieldPath", "string",