Revert "fix: Seperate normal modules into a type discriminated union"

This reverts commit 27ff5d3bc5.
2024-10-13 21:08:51 -04:00 · 2024-10-13 21:08:51 -04:00 · 3a49bd9846
commit 3a49bd9846
parent 63ee7ccd7a
1 changed files with 2 additions and 6 deletions
--- a/src-tsp/main.tsp
+++ b/src-tsp/main.tsp
@ -87,13 +87,8 @@ model ModuleList {
 }

@jsonSchema("module-v1.json")
+@oneOf
 union ModuleType {
-  normal: NormalModules,
-  custom: CustomModule,
-}
-
-@discriminator("type")
-union NormalModules {
  akmods: AkmodsModule,
  bling: BlingModule,
  brew: BrewModule,
@ -111,6 +106,7 @@ union NormalModules {
  signing: SigningModule,
  systemd: SystemdModule,
  yafti: YaftiModule,
+  custom: CustomModule,
 }

@discriminator("type")