Skip to content

Commit 719ce0f

Browse files
k0stikk0stik
committed
chore: mixins cleanups
1 parent 936d857 commit 719ce0f

File tree

3 files changed

+23
-50
lines changed

3 files changed

+23
-50
lines changed

‎dist/js/entity/mixins/DefaultableMixin.d.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ export declare function defaultableMixinProps<T extends InMemoryEntity>(item: T)
77
isDefault: boolean;
88
};
99
declare const staticProperties: {
10-
createDefault<T extends ClassBase>(this: T): InstanceType<T> & DefaultableProps;
10+
createDefault<T extends ClassBase>(this: T): InstanceType<T> & DefaultableInMemoryEntity;
1111
};
1212
export declare function defaultableMixinStaticProps<T extends ClassBase>(Item: T): {
13-
createDefault<T_1 extends ClassBase>(this: T_1): InstanceType<T_1> & DefaultableProps;
13+
createDefault<T_1 extends ClassBase>(this: T_1): InstanceType<T_1> & DefaultableInMemoryEntity;
1414
};
15-
type DefaultableProps = ReturnType<typeof defaultableMixinProps>;
16-
export type DefaultableConstructor = Constructor<DefaultableProps> & typeof staticProperties;
15+
export type DefaultableInMemoryEntity = ReturnType<typeof defaultableMixinProps>;
16+
export type DefaultableInMemoryEntityConstructor = Constructor<DefaultableInMemoryEntity>;
17+
export type DefaultableConstructor = DefaultableInMemoryEntityConstructor & typeof staticProperties;
1718
export default function DefaultableMixin<S extends ClassBase>(superclass: S): S & DefaultableConstructor;
1819
export {};

‎dist/js/entity/other.d.ts‎

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,26 @@
11
import { InMemoryEntity } from "./in_memory";
2-
declare const DefaultableInMemoryEntity_base: typeof InMemoryEntity & import("../utils/types").Constructor<{
3-
isDefault: boolean;
4-
}> & {
2+
declare const DefaultableInMemoryEntity_base: typeof InMemoryEntity & import("./mixins/DefaultableMixin").DefaultableInMemoryEntityConstructor & {
53
createDefault<T extends import("../utils/types").Constructor<InMemoryEntity> & {
64
defaultConfig?: object | null;
7-
}>(this: T): InstanceType<T> & {
8-
isDefault: boolean;
9-
};
5+
}>(this: T): InstanceType<T> & import("./mixins/DefaultableMixin").DefaultableInMemoryEntity;
106
};
117
export declare class DefaultableInMemoryEntity extends DefaultableInMemoryEntity_base {
128
}
139
export declare const NamedInMemoryEntity: typeof InMemoryEntity & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
14-
export declare const NamedDefaultableInMemoryEntity: typeof InMemoryEntity & import("../utils/types").Constructor<{
15-
isDefault: boolean;
16-
}> & {
10+
export declare const NamedDefaultableInMemoryEntity: typeof InMemoryEntity & import("./mixins/DefaultableMixin").DefaultableInMemoryEntityConstructor & {
1711
createDefault<T extends import("../utils/types").Constructor<InMemoryEntity> & {
1812
defaultConfig?: object | null;
19-
}>(this: T): InstanceType<T> & {
20-
isDefault: boolean;
21-
};
13+
}>(this: T): InstanceType<T> & import("./mixins/DefaultableMixin").DefaultableInMemoryEntity;
2214
} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
23-
export declare const HasMetadataNamedDefaultableInMemoryEntity: typeof InMemoryEntity & import("../utils/types").Constructor<{
24-
isDefault: boolean;
25-
}> & {
15+
export declare const HasMetadataNamedDefaultableInMemoryEntity: typeof InMemoryEntity & import("./mixins/DefaultableMixin").DefaultableInMemoryEntityConstructor & {
2616
createDefault<T extends import("../utils/types").Constructor<InMemoryEntity> & {
2717
defaultConfig?: object | null;
28-
}>(this: T): InstanceType<T> & {
29-
isDefault: boolean;
30-
};
18+
}>(this: T): InstanceType<T> & import("./mixins/DefaultableMixin").DefaultableInMemoryEntity;
3119
} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor & import("./mixins/HasMetadataMixin").HasMetadataInMemoryEntityConstructor;
32-
export declare const HasConsistencyChecksHasMetadataNamedDefaultableInMemoryEntity: typeof InMemoryEntity & import("../utils/types").Constructor<{
33-
isDefault: boolean;
34-
}> & {
20+
export declare const HasConsistencyChecksHasMetadataNamedDefaultableInMemoryEntity: typeof InMemoryEntity & import("./mixins/DefaultableMixin").DefaultableInMemoryEntityConstructor & {
3521
createDefault<T extends import("../utils/types").Constructor<InMemoryEntity> & {
3622
defaultConfig?: object | null;
37-
}>(this: T): InstanceType<T> & {
38-
isDefault: boolean;
39-
};
23+
}>(this: T): InstanceType<T> & import("./mixins/DefaultableMixin").DefaultableInMemoryEntity;
4024
} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor & import("./mixins/HasMetadataMixin").HasMetadataInMemoryEntityConstructor & import("./mixins/HasConsistencyChecksMixin").HasConsistencyChecksInMemoryEntityConstructor;
4125
export declare const NamedDefaultableRepetitionImportantSettingsInMemoryEntity: {
4226
new (...args: any[]): {
@@ -111,14 +95,10 @@ export declare const NamedDefaultableRepetitionImportantSettingsInMemoryEntity:
11195
readonly slug: string;
11296
readonly isSystemEntity: boolean;
11397
};
114-
} & typeof InMemoryEntity & import("../utils/types").Constructor<{
115-
isDefault: boolean;
116-
}> & {
98+
} & typeof InMemoryEntity & import("./mixins/DefaultableMixin").DefaultableInMemoryEntityConstructor & {
11799
createDefault<T extends import("../utils/types").Constructor<InMemoryEntity> & {
118100
defaultConfig?: object | null;
119-
}>(this: T): InstanceType<T> & {
120-
isDefault: boolean;
121-
};
101+
}>(this: T): InstanceType<T> & import("./mixins/DefaultableMixin").DefaultableInMemoryEntity;
122102
} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
123103
export declare const NamedDefaultableRepetitionContextAndRenderInMemoryEntity: {
124104
new (...params: any[]): {
@@ -196,14 +176,10 @@ export declare const NamedDefaultableRepetitionContextAndRenderInMemoryEntity: {
196176
readonly slug: string;
197177
readonly isSystemEntity: boolean;
198178
};
199-
} & typeof InMemoryEntity & import("../utils/types").Constructor<{
200-
isDefault: boolean;
201-
}> & {
179+
} & typeof InMemoryEntity & import("./mixins/DefaultableMixin").DefaultableInMemoryEntityConstructor & {
202180
createDefault<T extends import("../utils/types").Constructor<InMemoryEntity> & {
203181
defaultConfig?: object | null;
204-
}>(this: T): InstanceType<T> & {
205-
isDefault: boolean;
206-
};
182+
}>(this: T): InstanceType<T> & import("./mixins/DefaultableMixin").DefaultableInMemoryEntity;
207183
} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
208184
export declare const NamedDefaultableRepetitionRuntimeItemsImportantSettingsContextAndRenderHashedInMemoryEntity: {
209185
new (...args: any[]): {
@@ -437,13 +413,9 @@ export declare const NamedDefaultableRepetitionRuntimeItemsImportantSettingsCont
437413
readonly slug: string;
438414
readonly isSystemEntity: boolean;
439415
};
440-
} & typeof InMemoryEntity & import("../utils/types").Constructor<{
441-
isDefault: boolean;
442-
}> & {
416+
} & typeof InMemoryEntity & import("./mixins/DefaultableMixin").DefaultableInMemoryEntityConstructor & {
443417
createDefault<T extends import("../utils/types").Constructor<InMemoryEntity> & {
444418
defaultConfig?: object | null;
445-
}>(this: T): InstanceType<T> & {
446-
isDefault: boolean;
447-
};
419+
}>(this: T): InstanceType<T> & import("./mixins/DefaultableMixin").DefaultableInMemoryEntity;
448420
} & import("./mixins/NamedEntityMixin").NamedInMemoryEntityConstructor;
449421
export {};

‎src/js/entity/mixins/DefaultableMixin.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export function defaultableMixinProps<T extends InMemoryEntity>(item: T) {
2525

2626
const staticProperties = {
2727
createDefault<T extends ClassBase>(this: T) {
28-
return new this(this.defaultConfig) as InstanceType<T> & DefaultableProps;
28+
return new this(this.defaultConfig) as InstanceType<T> & DefaultableInMemoryEntity;
2929
},
3030
};
3131

@@ -35,9 +35,9 @@ export function defaultableMixinStaticProps<T extends ClassBase>(Item: T) {
3535
return staticProperties;
3636
}
3737

38-
type DefaultableProps = ReturnType<typeof defaultableMixinProps>;
39-
40-
export type DefaultableConstructor = Constructor<DefaultableProps> & typeof staticProperties;
38+
export type DefaultableInMemoryEntity = ReturnType<typeof defaultableMixinProps>;
39+
export type DefaultableInMemoryEntityConstructor = Constructor<DefaultableInMemoryEntity>;
40+
export type DefaultableConstructor = DefaultableInMemoryEntityConstructor & typeof staticProperties;
4141

4242
export default function DefaultableMixin<S extends ClassBase>(superclass: S) {
4343
class DefaultableMixin extends superclass {

0 commit comments

Comments
 (0)