feathersjs · daffl · Sep 5, 2025 · Sep 9, 2024 · Sep 9, 2024 · Sep 5, 2025
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/generators/package.json b/packages/generators/package.json
@@ -79,6 +79,7 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.3.1",
     "@types/prettier": "^2.7.3",
+    "@sinclair/typebox": "^0.34.0",
     "axios": "^1.11.0",
     "knex": "^3.1.0",
     "mocha": "^11.7.2",

diff --git a/packages/generators/src/app/index.ts b/packages/generators/src/app/index.ts
@@ -182,6 +182,7 @@ export const generate = (ctx: AppGeneratorArguments) =>
 
           if (schema === 'typebox') {
             dependencies.push('@feathersjs/typebox')
+            dependencies.push('@sinclair/typebox')
           }
 
           return addVersions(dependencies, dependencyVersions)

diff --git a/packages/generators/src/app/templates/configuration.tpl.ts b/packages/generators/src/app/templates/configuration.tpl.ts
@@ -58,7 +58,7 @@ import type { Static } from '@feathersjs/typebox'
 
 import { dataValidator } from './validators'
 
-export const configurationSchema = Type.Intersect([
+export const configurationSchema = Type.Composite([
   defaultAppConfiguration,
   Type.Object({
     host: Type.String(),

diff --git a/packages/generators/src/service/templates/schema.typebox.tpl.ts b/packages/generators/src/service/templates/schema.typebox.tpl.ts
@@ -53,7 +53,7 @@ export const ${camelName}ExternalResolver = resolve<${upperName}, HookContext<${
     authStrategies,
     `// The password should never be visible externally
   password: async () => undefined`
-  )}  
+  )}
 })
 
 // Schema for creating new entries
@@ -90,8 +90,8 @@ export const ${camelName}QueryProperties = Type.Pick(${camelName}Schema, [
       : `'text'`
   }
 ])
-export const ${camelName}QuerySchema = Type.Intersect([
-  querySyntax(${camelName}QueryProperties),
+export const ${camelName}QuerySchema = Type.Composite([
+  querySyntax(${camelName}QueryProperties, {}),
   // Add additional query properties here
   Type.Object({}, { additionalProperties: false })
 ], { additionalProperties: false })

diff --git a/packages/typebox/package.json b/packages/typebox/package.json
@@ -54,15 +54,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/schema": "^5.0.34",
-    "@sinclair/typebox": "^0.25.0"
+    "@feathersjs/schema": "^5.0.34"
+  },
+  "peerDependencies": {
+    "@sinclair/typebox": ">=0.26.0"
   },
   "devDependencies": {
+    "@sinclair/typebox": "^0.34.0",
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.3.1",
     "mocha": "^11.7.2",
     "shx": "^0.4.0",
     "typescript": "^5.9.2"
   },
   "gitHead": "90caf635aec850550b9d37bea2762af959d9e8d5"
-}
+}
diff --git a/packages/typebox/src/index.ts b/packages/typebox/src/index.ts
@@ -97,30 +97,28 @@ export function sortDefinition<T extends TObject>(schema: T) {
  */
 export const queryProperty = <T extends TSchema, X extends { [key: string]: TSchema }>(
   def: T,
-  extension: X = {} as X
+  extension: X
 ) =>
-  Type.Optional(
-    Type.Union([
-      def,
-      Type.Partial(
-        Type.Intersect(
-          [
-            Type.Object({
-              $gt: def,
-              $gte: def,
-              $lt: def,
-              $lte: def,
-              $ne: def,
-              $in: def.type === 'array' ? def : Type.Array(def),
-              $nin: def.type === 'array' ? def : Type.Array(def)
-            }),
-            Type.Object(extension)
-          ],
-          { additionalProperties: false }
-        )
+  Type.Union([
+    def,
+    Type.Partial(
+      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 || {}) as X)
+        ],
+        { additionalProperties: false }
       )
-    ])
-  )
+    )
+  ])
 
 type QueryProperty<T extends TSchema, X extends { [key: string]: TSchema }> = ReturnType<
   typeof queryProperty<T, X>
@@ -138,7 +136,7 @@ export const queryProperties = <
   X extends { [K in keyof T['properties']]?: { [key: string]: TSchema } }
 >(
   definition: T,
-  extensions: X = {} as X
+  extensions: X
 ) => {
   const properties = Object.keys(definition.properties).reduce(
     (res, key) => {
@@ -160,7 +158,7 @@ export const queryProperties = <
  * and `$sort` and `$select` for the allowed properties.
  *
  * @param type The properties to create the query syntax for
- * @param extensions Additional properties to add to the query syntax
+ * @param extensions Additional properties to add to the query syntax, use `{}` if none
  * @param options Options for the TypeBox object schema
  * @returns A TypeBox object representing the complete Feathers query syntax for the given properties
  */
@@ -169,30 +167,26 @@ export const querySyntax = <
   X extends { [K in keyof T['properties']]?: { [key: string]: TSchema } }
 >(
   type: T,
-  extensions: X = {} as X,
+  extensions: X,
   options: ObjectOptions = { additionalProperties: false }
 ) => {
   const propertySchema = queryProperties(type, extensions)
   const $or = Type.Array(propertySchema)
   const $and = Type.Array(Type.Union([propertySchema, Type.Object({ $or })]))
 
-  return Type.Intersect(
-    [
-      Type.Partial(
-        Type.Object(
-          {
-            $limit: Type.Number({ minimum: 0 }),
-            $skip: Type.Number({ minimum: 0 }),
-            $sort: sortDefinition(type),
-            $select: arrayOfKeys(type),
-            $and,
-            $or
-          },
-          { additionalProperties: false }
-        )
-      ),
-      propertySchema
-    ],
+  return Type.Partial(
+    Type.Object(
+      {
+        $limit: Type.Number({ minimum: 0 }),
+        $skip: Type.Number({ minimum: 0 }),
+        $sort: sortDefinition(type),
+        $select: arrayOfKeys(type),
+        $and,
+        $or,
+        ...propertySchema.properties
+      },
+      { additionalProperties: false }
+    ),
     options
   )
 }

diff --git a/packages/typebox/test/index.test.ts b/packages/typebox/test/index.test.ts
@@ -18,7 +18,7 @@ describe('@feathersjs/schema/typebox', () => {
         name: Type.String(),
         age: Type.Number()
       })
-      const querySchema = querySyntax(schema)
+      const querySchema = querySyntax(schema, {})
 
       type Query = Static<typeof querySchema>
 
@@ -41,7 +41,7 @@ describe('@feathersjs/schema/typebox', () => {
     })
 
     it('querySyntax works with no properties', async () => {
-      const schema = querySyntax(Type.Object({}))
+      const schema = querySyntax(Type.Object({}), {})
 
       new Ajv().compile(schema)
     })
@@ -80,29 +80,8 @@ describe('@feathersjs/schema/typebox', () => {
     })
   })
 
-  it('$in and $nin works with array type', async () => {
-    const schema = Type.Object({
-      things: Type.Array(Type.Number())
-    })
-    const querySchema = querySyntax(schema)
-    const validator = new Ajv().compile(querySchema)
-
-    type Query = Static<typeof querySchema>
-
-    const query: Query = {
-      things: {
-        $in: [10, 20],
-        $nin: [30]
-      }
-    }
-
-    const validated = (await validator(query)) as any as Query
-
-    assert.ok(validated)
-  })
-
   it('defaultAppConfiguration', async () => {
-    const configSchema = Type.Intersect([
+    const configSchema = Type.Composite([
       defaultAppConfiguration,
       Type.Object({
         host: Type.String(),