Trait refactoring
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Julien Valverdé
2024-02-24 22:50:06 +01:00
parent dc41001651
commit bb1ae3b48f
4 changed files with 15 additions and 15 deletions

View File

@@ -6,7 +6,7 @@ import { Extend, StaticMembers } from "./util"
export class Trait< export class Trait<
SuperExpression extends TraitExpression< SuperExpression extends TraitExpression<
typeof TraitExpression.NullSuperclass, typeof TraitExpression.NullSuperclass,
Trait<any, any, any, any>[] readonly Trait<any, any, any, any>[]
>, >,
Abstract extends object, Abstract extends object,
StaticAbstract extends object, StaticAbstract extends object,

View File

@@ -10,7 +10,7 @@ declare const implSuperSymbol: unique symbol
export class TraitBuilder< export class TraitBuilder<
SuperExpression extends TraitExpression< SuperExpression extends TraitExpression<
typeof TraitExpression.NullSuperclass, typeof TraitExpression.NullSuperclass,
Trait<any, any, any, any>[] readonly Trait<any, any, any, any>[]
>, >,
Abstract extends object, Abstract extends object,
StaticAbstract extends object, StaticAbstract extends object,

View File

@@ -6,7 +6,7 @@ import { Extend, StaticMembers } from "./util"
export class TraitExpression< export class TraitExpression<
Superclass extends AbstractClass<object>, Superclass extends AbstractClass<object>,
const Traits extends Trait<any, any, any, any>[], const Traits extends readonly Trait<any, any, any, any>[],
> { > {
constructor( constructor(
readonly superclass: Superclass, readonly superclass: Superclass,
@@ -95,7 +95,7 @@ export namespace TraitExpression {
export type Implements< export type Implements<
Exp extends TraitExpression<any, Trait<any, any, any, any>[]> Exp extends TraitExpression<any, readonly Trait<any, any, any, any>[]>
> = ( > = (
Simplify< Simplify<
Extend< Extend<
@@ -107,7 +107,7 @@ export type Implements<
) )
export type StaticImplements< export type StaticImplements<
Exp extends TraitExpression<any, Trait<any, any, any, any>[]> Exp extends TraitExpression<any, readonly Trait<any, any, any, any>[]>
> = ( > = (
Simplify< Simplify<
Extend< Extend<
@@ -120,7 +120,7 @@ export type StaticImplements<
export type TraitExpressionClass< export type TraitExpressionClass<
Exp extends TraitExpression<any, Trait<any, any, any, any>[]> Exp extends TraitExpression<any, readonly Trait<any, any, any, any>[]>
> = ( > = (
AbstractClass< AbstractClass<
TraitExpressionInstance<Exp>, TraitExpressionInstance<Exp>,
@@ -130,7 +130,7 @@ export type TraitExpressionClass<
) )
export type TraitExpressionConcreteClass< export type TraitExpressionConcreteClass<
Exp extends TraitExpression<any, Trait<any, any, any, any>[]> Exp extends TraitExpression<any, readonly Trait<any, any, any, any>[]>
> = ( > = (
Class< Class<
TraitExpressionInstance<Exp>, TraitExpressionInstance<Exp>,
@@ -140,7 +140,7 @@ export type TraitExpressionConcreteClass<
) )
export type TraitExpressionInstance< export type TraitExpressionInstance<
Exp extends TraitExpression<any, Trait<any, any, any, any>[]> Exp extends TraitExpression<any, readonly Trait<any, any, any, any>[]>
> = ( > = (
InstanceType<TraitExpression.Superclass<Exp>> & // Keep the instance of the superclass outside of any kind of type manipulation InstanceType<TraitExpression.Superclass<Exp>> & // Keep the instance of the superclass outside of any kind of type manipulation
// as it can accidentely remove abstract properties // as it can accidentely remove abstract properties
@@ -152,7 +152,7 @@ export type TraitExpressionInstance<
) )
export type TraitExpressionStaticMembers< export type TraitExpressionStaticMembers<
Exp extends TraitExpression<any, Trait<any, any, any, any>[]> Exp extends TraitExpression<any, readonly Trait<any, any, any, any>[]>
> = ( > = (
Simplify< Simplify<
Extend<[ Extend<[

View File

@@ -7,7 +7,7 @@ import { Extendable, StaticMembers } from "./util"
export class TraitExpressionBuilder< export class TraitExpressionBuilder<
Superclass extends AbstractClass<object>, Superclass extends AbstractClass<object>,
const Traits extends Trait<any, any, any, any>[], const Traits extends readonly Trait<any, any, any, any>[],
> { > {
declare ["constructor"]: typeof TraitExpressionBuilder declare ["constructor"]: typeof TraitExpressionBuilder
@@ -21,7 +21,7 @@ export class TraitExpressionBuilder<
const T extends Trait< const T extends Trait<
TraitExpression< TraitExpression<
typeof TraitExpression.NullSuperclass, typeof TraitExpression.NullSuperclass,
Trait<any, any, any, any>[] readonly Trait<any, any, any, any>[]
>, >,
any, any,
any, any,
@@ -40,7 +40,7 @@ export class TraitExpressionBuilder<
const T extends Trait< const T extends Trait<
TraitExpression< TraitExpression<
typeof TraitExpression.NullSuperclass, typeof TraitExpression.NullSuperclass,
Trait<any, any, any, any>[] readonly Trait<any, any, any, any>[]
>, >,
any, any,
any, any,
@@ -68,7 +68,7 @@ export class TraitExpressionBuilder<
const T extends Trait< const T extends Trait<
TraitExpression< TraitExpression<
typeof TraitExpression.NullSuperclass, typeof TraitExpression.NullSuperclass,
Trait<any, any, any, any>[] readonly Trait<any, any, any, any>[]
>, >,
any, any,
any, any,
@@ -94,7 +94,7 @@ export class TraitExpressionBuilder<
const T extends Trait< const T extends Trait<
TraitExpression< TraitExpression<
typeof TraitExpression.NullSuperclass, typeof TraitExpression.NullSuperclass,
Trait<any, any, any, any>[] readonly Trait<any, any, any, any>[]
>, >,
any, any,
any, any,
@@ -194,7 +194,7 @@ export namespace TraitExpressionBuilder {
export type BuildTraitExpression< export type BuildTraitExpression<
Superclass extends AbstractClass<object>, Superclass extends AbstractClass<object>,
Traits extends Trait<any, any, any, any>[], Traits extends readonly Trait<any, any, any, any>[],
> = ( > = (
Extendable<TraitTuple.MapAbstract<Traits>> extends false Extendable<TraitTuple.MapAbstract<Traits>> extends false
? "Type conflict between the traits abstract definitions." ? "Type conflict between the traits abstract definitions."