feathersjs · daffl · Apr 28, 2023 · Apr 28, 2023 · Apr 28, 2023
diff --git a/docs/api/schema/typebox.md b/docs/api/schema/typebox.md
@@ -1004,16 +1004,6 @@ const T = {
 }
 ```
 
-<BlockQuote type="warning" label="note">
-
-TypeBox 0.26.0 introduced a breaking change in `Type.Intersect`. `@feathersjs/typebox` maintains the original behaviour which is now available in TypeBox as `Type.Composite`. It you want to use the new `Type.Intersect` use
-
-```ts
-import { Intersect } from '@feathersjs/typebox'
-```
-
-</BlockQuote>
-
 ##### Never
 
 Creates a type that will never validate if the attribute is present. This is useful if you are allowing [additionalProperties](#additionalproperties) but need to prevent using specific keys.

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
   },
   "scripts": {
     "install": "lerna bootstrap",
-    "publish": "lerna publish && git commit -am \"chore: Update changelog\" && git push origin",
+    "publish": "lerna publish --force-publish && git commit -am \"chore: Update changelog\" && git push origin",
     "publish:major": "lerna publish major && git commit -am \"chore: Update changelog\" && git push origin",
     "publish:minor": "lerna publish minor && git commit -am \"chore: Update changelog\" && git push origin",
     "publish:patch": "lerna publish patch && git commit -am \"chore: Update changelog\" && git push origin",

diff --git a/packages/adapter-tests/src/index.ts b/packages/adapter-tests/src/index.ts
@@ -30,9 +30,7 @@ export const adapterTests = (testNames: AdapterTestName[]) => {
       after(() => {
         testNames.forEach((name) => {
           if (!allTests.includes(name)) {
-            console.error(
-              `WARNING: '${name}' test is not part of the test suite`
-            )
+            console.error(`WARNING: '${name}' test is not part of the test suite`)
           }
         })
         if (skippedTests.length) {

diff --git a/packages/typebox/package.json b/packages/typebox/package.json
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@feathersjs/schema": "^5.0.4",
-    "@sinclair/typebox": "^0.26.8"
+    "@sinclair/typebox": "^0.25.0"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.1",

diff --git a/packages/typebox/src/index.ts b/packages/typebox/src/index.ts
@@ -1,67 +1,9 @@
-import {
-  TObject,
-  TInteger,
-  TOptional,
-  TSchema,
-  TIntersect,
-  ObjectOptions,
-  ExtendedTypeBuilder,
-  SchemaOptions,
-  TNever,
-  IntersectOptions,
-  TypeGuard,
-  Kind
-} from '@sinclair/typebox'
+import { Type, TObject, TInteger, TOptional, TSchema, ObjectOptions } from '@sinclair/typebox'
 import { jsonSchema, Validator, DataValidatorMap, Ajv } from '@feathersjs/schema'
 
 export * from '@sinclair/typebox'
 export * from './default-schemas'
 
-/**
- * Feathers TypeBox customisations. Implements the 0.25.0 fallback for Intersect types.
- * @see https://github.com/sinclairzx81/typebox/issues/373
- */
-export class FeathersTypeBuilder extends ExtendedTypeBuilder {
-  /** `[Standard]` Creates a Intersect type */
-  public Intersect(allOf: [], options?: SchemaOptions): TNever
-  /** `[Standard]` Creates a Intersect type */
-  public Intersect<T extends [TObject]>(allOf: [...T], options?: SchemaOptions): T[0]
-  // /** `[Standard]` Creates a Intersect type */
-  public Intersect<T extends TObject[]>(allOf: [...T], options?: IntersectOptions): TIntersect<T>
-  public Intersect(allOf: TObject[], options: IntersectOptions = {}) {
-    const [required, optional] = [new Set<string>(), new Set<string>()]
-    for (const object of allOf) {
-      for (const [key, property] of Object.entries(object.properties)) {
-        if (TypeGuard.TOptional(property) || TypeGuard.TReadonlyOptional(property)) optional.add(key)
-      }
-    }
-    for (const object of allOf) {
-      for (const key of Object.keys(object.properties)) {
-        if (!optional.has(key)) required.add(key)
-      }
-    }
-    const properties = {} as Record<string, any>
-    for (const object of allOf) {
-      for (const [key, schema] of Object.entries(object.properties)) {
-        properties[key] =
-          properties[key] === undefined
-            ? schema
-            : { [Kind]: 'Union', anyOf: [properties[key], { ...schema }] }
-      }
-    }
-    if (required.size > 0) {
-      return { ...options, [Kind]: 'Object', type: 'object', properties, required: [...required] } as any
-    } else {
-      return { ...options, [Kind]: 'Object', type: 'object', properties } as any
-    }
-  }
-}
-
-/**
- * Exports our own type builder
- */
-export const Type = new FeathersTypeBuilder()
-
 export type TDataSchemaMap = {
   create: TObject
   update?: TObject
@@ -75,7 +17,7 @@ export type TDataSchemaMap = {
  * @param validator The AJV validation instance
  * @returns A compiled validation function
  */
-export const getValidator = <T = any, R = T>(schema: TObject | TIntersect, validator: Ajv): Validator<T, R> =>
+export const getValidator = <T = any, R = T>(schema: TObject, validator: Ajv): Validator<T, R> =>
   jsonSchema.getValidator(schema as any, validator)
 
 /**
@@ -100,7 +42,7 @@ export function StringEnum<T extends string[]>(allowedValues: [...T]) {
   return Type.Unsafe<T[number]>({ type: 'string', enum: allowedValues })
 }
 
-const arrayOfKeys = <T extends TObject | TIntersect>(type: T) => {
+const arrayOfKeys = <T extends TObject>(type: T) => {
   const keys = Object.keys(type.properties)
   return Type.Unsafe<(keyof T['properties'])[]>({
     type: 'array',
@@ -118,7 +60,7 @@ const arrayOfKeys = <T extends TObject | TIntersect>(type: T) => {
  * @param schema The TypeBox object schema
  * @returns The `$sort` syntax schema
  */
-export function sortDefinition<T extends TObject | TIntersect>(schema: T) {
+export function sortDefinition<T extends TObject>(schema: T) {
   const properties = Object.keys(schema.properties).reduce((res, key) => {
     const result = res
CE7
 as any
 
@@ -146,7 +88,7 @@ export const queryProperty = <T extends TSchema, X extends { [key: string]: TSch
     Type.Union([
       def,
       Type.Partial(
-        Type.Composite(
+        Type.Intersect(
           [
             Type.Object({
               $gt: def,
@@ -177,7 +119,7 @@ type QueryProperty<T extends TSchema, X extends { [key: string]: TSchema }> = Re
  * @returns The Feathers query syntax schema
  */
 export const queryProperties = <
-  T extends TObject | TIntersect,
+  T extends TObject,
   X extends { [K in keyof T['properties']]?: { [key: string]: TSchema } }
 >(
   definition: T,
@@ -205,7 +147,7 @@ export const queryProperties = <
  * @returns A TypeBox object representing the complete Feathers query syntax for the given properties
  */
 export const querySyntax = <
-  T extends TObject | TIntersect,
+  T extends TObject,
   X extends { [K in keyof T['properties']]?: { [key: string]: TSchema } }
 >(
   type: T,
@@ -216,7 +158,7 @@ export const querySyntax = <
   const $or = Type.Array(propertySchema)
   const $and = Type.Array(Type.Union([propertySchema, Type.Object({ $or })]))
 
-  return Type.Composite(
+  return Type.Intersect(
     [
       Type.Partial(
         Type.Object(

diff --git a/packages/typebox/test/index.test.ts b/packages/typebox/test/index.test.ts
@@ -10,7 +10,6 @@ import {
   getValidator,
   ObjectIdSchema
 } from '../src'
-import { FeathersTypeBuilder } from '../src'
 
 describe('@feathersjs/schema/typebox', () => {
   describe('querySyntax', () => {
@@ -101,10 +100,6 @@ describe('@feathersjs/schema/typebox', () => {
     assert.ok(validated)
   })
 
-  it('exports custom type builder', () => {
-    assert.ok(Type instanceof FeathersTypeBuilder)
-  })
-
   // Test ObjectId validation
   it('ObjectId', async () => {
     const schema = Type.Object({