Thilawyn/traitify-ts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Static abstract
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Julien Valverdé
2024-02-09 14:30:10 +01:00
parent 1a88ceb296
commit e31ddeaa6e
4 changed files with 81 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/TraitExpression.ts
View File

@@ -14,8 +14,8 @@ import { ExtendFn, SimplifyFn, StaticMembersFn } from "./util"
export class TraitExpression<
Superclass extends AbstractClass<{}>,
const OwnTraits extends Trait<any, any, any>[],
const AllTraits extends Trait<any, any, any>[],
const OwnTraits extends Trait<any, any, any, any>[],
const AllTraits extends Trait<any, any, any, any>[],
> {
constructor(
readonly superclass: Superclass,
@@ -52,17 +52,20 @@ export class TraitExpression<
subtrait<
This extends TraitExpression<typeof TraitExpression.NullSuperclass, any, any>,
SubtraitAbstract extends Implements<This>,
SubtraitStaticAbstract extends StaticImplements<This>,
SubtraitImplClassWithAbstract extends Class<SubtraitAbstract, []> & { _tag: TraitApplierSuperTag },
>(
this: This,
abstract: (expression: This) => Opaque<SubtraitAbstract, AbstractTag>,
apply: (Super: AbstractClass<SubtraitAbstract> & { _tag: TraitApplierSuperTag }) => SubtraitImplClassWithAbstract,
this: This,
abstract: (expression: This) => Opaque<SubtraitAbstract, AbstractTag>,
staticAbstract: (expression: This) => Opaque<SubtraitStaticAbstract, AbstractTag>,
apply: (Super: AbstractClass<SubtraitAbstract> & { _tag: TraitApplierSuperTag }) => SubtraitImplClassWithAbstract,
) {
return new Trait(
this,
// {} as RemoveSupertraitsAbstractFromAbstract<SubtraitAbstract, Implements<typeof this>>,
{} as SubtraitAbstract, // TODO: find a way to cleanly substract Implements<typeof this> from this.
apply as any as (Super: AbstractClass<{}>) => RemoveAbstractFromImplClass<SubtraitImplClassWithAbstract, SubtraitAbstract>,
{} as SubtraitAbstract, // TODO: find a way to cleanly substract Implements<typeof this> from this.
{} as SubtraitStaticAbstract,
apply as any as (Super: AbstractClass<{}>) => RemoveAbstractFromImplClass<SubtraitImplClassWithAbstract, SubtraitAbstract, SubtraitStaticAbstract>,
)
}
}
@@ -111,3 +114,12 @@ export type Implements<Exp extends TraitExpression<any, any, any>> = (
SimplifyFn,
]>
)
export type StaticImplements<Exp extends TraitExpression<any, any, any>> = (
Pipe<Exp, [
TraitExpression.AllTraitsFn,
Tuples.Map<Trait.OwnStaticAbstractFn>,
ExtendFn,
SimplifyFn,
]>
)