From 94a7f41fd1b0698e026332d4c3dac8da7e6b1a47 Mon Sep 17 00:00:00 2001
From: thepaperpilot <thepaperpilot@gmail.com>
Date: Sun, 24 Apr 2022 17:05:28 -0500
Subject: [PATCH] Made several options functions optional

---
 src/features/achievements/achievement.tsx | 4 ++--
 src/features/clickables/clickable.ts      | 4 ++--
 src/features/links/links.ts               | 2 +-
 src/features/milestones/milestone.tsx     | 6 +++---
 src/features/particles/particles.tsx      | 4 ++--
 src/features/tabs/tabFamily.ts            | 3 +--
 src/features/trees/tree.ts                | 4 ++--
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/features/achievements/achievement.tsx b/src/features/achievements/achievement.tsx
index 29b5460..0919482 100644
--- a/src/features/achievements/achievement.tsx
+++ b/src/features/achievements/achievement.tsx
@@ -68,11 +68,11 @@ export type GenericAchievement = Replace<
 >;
 
 export function createAchievement<T extends AchievementOptions>(
-    optionsFunc: OptionsFunc<T, Achievement<T>, BaseAchievement>
+    optionsFunc?: OptionsFunc<T, Achievement<T>, BaseAchievement>
 ): Achievement<T> {
     const earned = persistent<boolean>(false);
     return createLazyProxy(() => {
-        const achievement = optionsFunc();
+        const achievement = optionsFunc?.() ?? ({} as ReturnType<NonNullable<typeof optionsFunc>>);
         achievement.id = getUniqueID("achievement-");
         achievement.type = AchievementType;
         achievement[Component] = AchievementComponent;
diff --git a/src/features/clickables/clickable.ts b/src/features/clickables/clickable.ts
index 929599c..37b898e 100644
--- a/src/features/clickables/clickable.ts
+++ b/src/features/clickables/clickable.ts
@@ -70,10 +70,10 @@ export type GenericClickable = Replace<
 >;
 
 export function createClickable<T extends ClickableOptions>(
-    optionsFunc: OptionsFunc<T, Clickable<T>, BaseClickable>
+    optionsFunc?: OptionsFunc<T, Clickable<T>, BaseClickable>
 ): Clickable<T> {
     return createLazyProxy(() => {
-        const clickable = optionsFunc();
+        const clickable = optionsFunc?.() ?? ({} as ReturnType<NonNullable<typeof optionsFunc>>);
         clickable.id = getUniqueID("clickable-");
         clickable.type = ClickableType;
         clickable[Component] = ClickableComponent;
diff --git a/src/features/links/links.ts b/src/features/links/links.ts
index 4443b65..ea100f4 100644
--- a/src/features/links/links.ts
+++ b/src/features/links/links.ts
@@ -20,7 +20,7 @@ export interface Link extends SVGAttributes {
 }
 
 export interface LinksOptions {
-    links?: Computable<Link[]>;
+    links: Computable<Link[]>;
 }
 
 export interface BaseLinks {
diff --git a/src/features/milestones/milestone.tsx b/src/features/milestones/milestone.tsx
index 00322f9..879a253 100644
--- a/src/features/milestones/milestone.tsx
+++ b/src/features/milestones/milestone.tsx
@@ -84,11 +84,11 @@ export type GenericMilestone = Replace<
 >;
 
 export function createMilestone<T extends MilestoneOptions>(
-    optionsFunc: OptionsFunc<T, Milestone<T>, BaseMilestone>
+    optionsFunc?: OptionsFunc<T, Milestone<T>, BaseMilestone>
 ): Milestone<T> {
     const earned = persistent<boolean>(false);
-    return createLazyProxy(persistent => {
-        const milestone = Object.assign(persistent, optionsFunc());
+    return createLazyProxy(() => {
+        const milestone = optionsFunc?.() ?? ({} as ReturnType<NonNullable<typeof optionsFunc>>);
         milestone.id = getUniqueID("milestone-");
         milestone.type = MilestoneType;
         milestone[Component] = MilestoneComponent;
diff --git a/src/features/particles/particles.tsx b/src/features/particles/particles.tsx
index 4120a39..345191b 100644
--- a/src/features/particles/particles.tsx
+++ b/src/features/particles/particles.tsx
@@ -42,10 +42,10 @@ export type Particles<T extends ParticlesOptions> = Replace<
 export type GenericParticles = Particles<ParticlesOptions>;
 
 export function createParticles<T extends ParticlesOptions>(
-    optionsFunc: OptionsFunc<T, Particles<T>, BaseParticles>
+    optionsFunc?: OptionsFunc<T, Particles<T>, BaseParticles>
 ): Particles<T> {
     return createLazyProxy(() => {
-        const particles = optionsFunc();
+        const particles = optionsFunc?.() ?? ({} as ReturnType<NonNullable<typeof optionsFunc>>);
         particles.id = getUniqueID("particles-");
         particles.type = ParticlesType;
         particles[Component] = ParticlesComponent;
diff --git a/src/features/tabs/tabFamily.ts b/src/features/tabs/tabFamily.ts
index 741c4e6..2a4f332 100644
--- a/src/features/tabs/tabFamily.ts
+++ b/src/features/tabs/tabFamily.ts
@@ -101,8 +101,7 @@ export function createTabFamily<T extends TabFamilyOptions>(
 
     const selected = persistent(Object.keys(tabs)[0]);
     return createLazyProxy(() => {
-        const tabFamily =
-            optionsFunc?.() || ({} as ReturnType<OptionsFunc<T, TabFamily<T>, BaseTabFamily>>);
+        const tabFamily = optionsFunc?.() ?? ({} as ReturnType<NonNullable<typeof optionsFunc>>);
 
         tabFamily.id = getUniqueID("tabFamily-");
         tabFamily.type = TabFamilyType;
diff --git a/src/features/trees/tree.ts b/src/features/trees/tree.ts
index 2f07573..459a392 100644
--- a/src/features/trees/tree.ts
+++ b/src/features/trees/tree.ts
@@ -73,10 +73,10 @@ export type GenericTreeNode = Replace<
 >;
 
 export function createTreeNode<T extends TreeNodeOptions>(
-    optionsFunc: OptionsFunc<T, TreeNode<T>, BaseTreeNode>
+    optionsFunc?: OptionsFunc<T, TreeNode<T>, BaseTreeNode>
 ): TreeNode<T> {
     return createLazyProxy(() => {
-        const treeNode = optionsFunc();
+        const treeNode = optionsFunc?.() ?? ({} as ReturnType<NonNullable<typeof optionsFunc>>);
         treeNode.id = getUniqueID("treeNode-");
         treeNode.type = TreeNodeType;
         treeNode[Component] = TreeNodeComponent;