fix(schema): Fix TypeBox extension value query syntax inference (#3010)

feathersjs · Jan 26, 2023 · f1c7a76 · f1c7a76
1 parent e4a9da5
commit f1c7a76
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/packages/typebox/src/index.ts b/packages/typebox/src/index.ts
@@ -88,17 +88,21 @@ export const queryProperty = <T extends TSchema, X extends { [key: string]: TSch
     Type.Union([
       def,
       Type.Partial(
-        Type.Object({
-          $gt: def,
-          $gte: def,
-          $lt: def,
-          $lte: def,
-          $ne: def,
-          $in: Type.Array(def),
-          $nin: Type.Array(def),
-          ...extension
-        }),
-        { additionalProperties: false }
+        Type.Intersect(
+          [
+            Type.Object({
+              $gt: def,
+              $gte: def,
+              $lt: def,
+              $lte: def,
+              $ne: def,
+              $in: Type.Array(def),
+              $nin: Type.Array(def)
+            }),
+            Type.Object(extension)
+          ],
+          { additionalProperties: false }
+        )
       )
     ])
   )