diff --git a/bun.lockb b/bun.lockb index fe3e53f..79b9851 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 76862df..1d4df7b 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,11 @@ "npm-check-updates": "^16.14.20", "npm-sort": "^0.0.4", "tsup": "^8.0.2", - "tsx": "^4.9.3", + "tsx": "^4.9.4", "typescript": "^5.4.5" }, "optionalDependencies": { - "@effect/schema": "^0.66.16", + "@effect/schema": "^0.67.0", "effect": "^3.1.3" } } diff --git a/src/effect.ts b/src/effect.ts deleted file mode 100644 index 53736ea..0000000 --- a/src/effect.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { Schema as S } from "@effect/schema" -import { Simplify } from "type-fest" -import { Trait, TraitTuple } from "./Trait" -import { TraitExpression } from "./TraitExpression" -import { Extend } from "./util" - - -export function extendsEffectSchemaExpression< - Fields extends S.Struct.Fields, - A, I, R, C, - Inherited extends object, - Proto, - - const Traits extends readonly Trait[], ->( - expression: TraitExpression< - S.Class, - Traits - > -) { - return (): ( - S.Class< - Self, - Fields, - A, I, R, C, - Simplify< - Extend<[ - Inherited, - ...TraitTuple.MapImplInstance - ]> - >, - Proto - > & - - Simplify< - Extend> - > - ) => expression.extends as any -} diff --git a/src/effect/tests.ts b/src/effect/tests.ts index 2ed34b7..bfbdaad 100644 --- a/src/effect/tests.ts +++ b/src/effect/tests.ts @@ -1,9 +1,7 @@ import { Schema as S } from "@effect/schema" import { Implements } from "../TraitExpression" -import { effectSchemaExpression } from "./EffectSchemaTraitExpressionBuilder" -import { StaticMembers } from "../util" -import { Trait } from "../Trait" import { EffectSchemaTraitExpression } from "./EffectSchemaTraitExpression" +import { effectSchemaExpression } from "./EffectSchemaTraitExpressionBuilder" type Extr = diff --git a/src/lib.ts b/src/lib.ts index 32077ec..a96aa6a 100644 --- a/src/lib.ts +++ b/src/lib.ts @@ -2,4 +2,3 @@ export { Trait, TraitClass, TraitConcreteClass, TraitInstance, TraitStaticMember export { ImplStatic, TraitBuilder, implStaticInstantiableThis, implStaticThis, trait } from "./TraitBuilder" export { Implements, StaticImplements, TraitExpression, TraitExpressionClass, TraitExpressionConcreteClass, TraitExpressionInstance, TraitExpressionStaticMembers } from "./TraitExpression" export { TraitExpressionBuilder, expression } from "./TraitExpressionBuilder" -export { extendsEffectSchemaExpression } from "./effect"