profectus/Profectus
Template
1
0
Fork 4
Code Issues 38 Pull requests 6 Projects 2 Releases Packages Wiki Activity Actions

[WIP] Improve lazy proxy typing #16

Draft
thepaperpilot wants to merge 4 commits from fix/lazy-proxy-typing into main
pull from: fix/lazy-proxy-typing
merge into: profectus:main
Conversation 0 Commits 4 Files changed 4 +8 -10
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a8c550c551 - Show all commits

18
src/features/achievements/achievement.tsx
View file

@ -182,6 +182,13 @@ export function createAchievement<T extends AchievementOptions>(
decorator.preConstruct?.(achievement); decorator.preConstruct?.(achievement);
} }
Object.assign(achievement, decoratedData); Object.assign(achievement, decoratedData);
for (const decorator of decorators) {
decorator.postConstruct?.(achievement);
}
const decoratedProps = decorators.reduce(
(current, next) => Object.assign(current, next.getGatheredProps?.(achievement)),
{}
);
function complete() { function complete() {
earned.value = true; earned.value = true;
@ -209,12 +216,7 @@ export function createAchievement<T extends AchievementOptions>(
} }
} }
const decoratedProps = decorators.reduce( function gatherProps(this: GenericAchievement): Record<string, unknown> {
(current, next) => Object.assign(current, next.getGatheredProps?.(achievement)),
{}
);
function gatherProps(this: Achievement<T>): Record<string, unknown> {
const { const {
visibility, visibility,
display, display,
@ -242,10 +244,6 @@ export function createAchievement<T extends AchievementOptions>(
}; };
} }
for (const decorator of decorators) {
decorator.postConstruct?.(achievement);
}
if (achievement.requirements != null) { if (achievement.requirements != null) {
const requirements = [ const requirements = [
createVisibilityRequirement(achievement), createVisibilityRequirement(achievement),