Revert adapterId removal

GMOD · Jul 22, 2024 · 69eaab3 · 69eaab3
1 parent eecd373
commit 69eaab3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/plugins/config/src/FromConfigAdapter/FromConfigAdapter.ts b/plugins/config/src/FromConfigAdapter/FromConfigAdapter.ts
@@ -45,9 +45,8 @@ export default class FromConfigAdapter extends BaseFeatureDataAdapter {
     pluginManager?: PluginManager,
   ) {
     super(conf, getSubAdapter, pluginManager)
-    this.features = makeFeatures(
-      (readConfObject(conf, 'features') || []) as SimpleFeatureSerialized[],
-    )
+    const feats = readConfObject(conf, 'features') as SimpleFeatureSerialized[]
+    this.features = makeFeatures(feats || [])
   }
 
   async getRefNames() {

diff --git a/plugins/config/src/FromConfigAdapter/configSchema.ts b/plugins/config/src/FromConfigAdapter/configSchema.ts
@@ -13,10 +13,10 @@ const configSchema = ConfigurationSchema(
      */
     features: {
       type: 'frozen',
-      defaultValue: null,
+      defaultValue: [],
     },
   },
-  { explicitlyTyped: true },
+  { explicitlyTyped: true, implicitIdentifier: 'adapterId' },
 )
 
 export default configSchema
diff --git a/plugins/config/src/FromConfigRegionsAdapter/FromConfigRegionsAdapter.ts b/plugins/config/src/FromConfigRegionsAdapter/FromConfigRegionsAdapter.ts
@@ -31,9 +31,8 @@ export default class FromConfigRegionsAdapter
     pluginManager?: PluginManager,
   ) {
     super(config, getSubAdapter, pluginManager)
-    this.features = makeFeatures(
-      (readConfObject(config, 'features') || []) as SimpleFeatureSerialized[],
-    )
+    const f = readConfObject(config, 'features') as SimpleFeatureSerialized[]
+    this.features = makeFeatures(f || [])
   }
 
   /**

diff --git a/plugins/config/src/FromConfigRegionsAdapter/configSchema.ts b/plugins/config/src/FromConfigRegionsAdapter/configSchema.ts
@@ -13,11 +13,12 @@ const regionsConfigSchema = ConfigurationSchema(
      */
     features: {
       type: 'frozen',
-      defaultValue: null,
+      defaultValue: [],
     },
   },
   {
     explicitlyTyped: true,
+    implicitIdentifier: 'adapterId',
   },
 )
 export default regionsConfigSchema
diff --git a/plugins/config/src/FromConfigSequenceAdapter/FromConfigSequenceAdapter.ts b/plugins/config/src/FromConfigSequenceAdapter/FromConfigSequenceAdapter.ts
@@ -78,8 +78,9 @@ export default class FromConfigSequenceAdapter
   }
 
   /**
-   * called to provide a hint that data tied to a certain region will not be
-   * needed for the foreseeable future and can be purged from caches, etc
+   * called to provide a hint that data tied to a certain region
+   * will not be needed for the foreseeable future and can be purged
+   * from caches, etc
    */
   freeResources(/* { region } */): void {}
 }
diff --git a/plugins/config/src/FromConfigSequenceAdapter/configSchema.ts b/plugins/config/src/FromConfigSequenceAdapter/configSchema.ts
@@ -12,10 +12,10 @@ const sequenceConfigSchema = ConfigurationSchema(
      */
     features: {
       type: 'frozen',
-      defaultValue: null,
+      defaultValue: [],
     },
   },
-  { explicitlyTyped: true },
+  { explicitlyTyped: true, implicitIdentifier: 'adapterId' },
 )
 
 export default sequenceConfigSchema
diff --git a/plugins/config/src/__snapshots__/index.test.ts.snap b/plugins/config/src/__snapshots__/index.test.ts.snap
@@ -2,4 +2,9 @@
 
 exports[`Config editing adds config editor widget 1`] = `{}`;
 
-exports[`Config editing creates proper FromConfigAdapter 1`] = `{}`;
+exports[`Config editing creates proper FromConfigAdapter 1`] = `
+{
+  "adapterId": "testFromConfigAdapterId",
+  "type": "FromConfigAdapter",
+}
+`;