From 9cae853a4419e51d2b775897f2fd827f4acf0c8c Mon Sep 17 00:00:00 2001
From: daffl <daff@neyeon.com>
Date: Wed, 25 Jan 2023 15:58:11 -0800
Subject: [PATCH] fix(schema): Fix TypeBox extension value query syntax
 inference

---
 packages/typebox/src/index.ts | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/packages/typebox/src/index.ts b/packages/typebox/src/index.ts
index 7165fe0d52..f7d0c2cafb 100644
--- 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 }
+        )
       )
     ])
   )