Enables config values to be backed by optional persistence

gristlabs · Jul 2, 2024 · 0a00bd0 · 0a00bd0
1 parent fe90bf6
commit 0a00bd0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/server/lib/config.ts b/app/server/lib/config.ts
@@ -117,12 +117,12 @@ export function fileConfigAccessorFactory<FileContents>(
  */
 export function createConfigValue<ValueType>(
   defaultValue: ValueType,
-  persistence?: ConfigAccessors<ValueType | undefined>,
+  persistence?: ConfigAccessors<ValueType> | ConfigAccessors<ValueType | undefined>,
 ): IWritableConfigValue<ValueType> {
-  let inMemoryValue = (persistence && persistence.get()) ?? defaultValue;
+  let inMemoryValue = (persistence && persistence.get());
   return {
-    get() {
-      return inMemoryValue;
+    get(): ValueType {
+      return inMemoryValue ?? defaultValue;
     },
     async set(value: ValueType) {
       if (persistence && persistence.set) {

diff --git a/app/server/lib/configCore.ts b/app/server/lib/configCore.ts
@@ -23,6 +23,6 @@ export async function loadGristCoreConfigFile(configPath?: string): Promise<IGri
 export function loadGristCoreConfig(fileConfig?: FileConfig<IGristCoreConfigFileLatest>): IGristCoreConfig {
   const fileConfigValue = fileConfigAccessorFactory(fileConfig);
   return {
-    edition: createConfigValue("core", fileConfigValue("edition"))
+    edition: createConfigValue<Edition>("core", fileConfigValue("edition"))
   };
 }
diff --git a/app/server/lib/configCoreFileFormats-ti.ts b/app/server/lib/configCoreFileFormats-ti.ts
@@ -8,7 +8,7 @@ export const IGristCoreConfigFileLatest = t.name("IGristCoreConfigFileV1");
 
 export const IGristCoreConfigFileV1 = t.iface([], {
   "version": t.lit("1"),
-  "edition": t.union(t.lit("core"), t.lit("enterprise")),
+  "edition": t.opt(t.union(t.lit("core"), t.lit("enterprise"))),
 });
 
 export const IGristCoreConfigFileV0 = t.iface([], {