Studio: theme editing

src/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts

@@ -246,6 +246,10 @@ class UpdateLegacyTheme extends DesugaringStep<LayoutConfigJson> {
             console.log("Removing old background in", json.id)
         }
 
+        if (typeof oldThemeConfig.credits === "string") {
+            oldThemeConfig.credits = [oldThemeConfig.credits]
+        }
+
         if (oldThemeConfig["roamingRenderings"] !== undefined) {
             if (oldThemeConfig["roamingRenderings"].length == 0) {
                 delete oldThemeConfig["roamingRenderings"]

src/Models/ThemeConfig/Conversion/PrepareTheme.ts

@@ -166,7 +166,7 @@ class AddDefaultLayers extends DesugaringStep<LayoutConfigJson> {
 
     convert(json: LayoutConfigJson, context: ConversionContext): LayoutConfigJson {
         const state = this._state
-        json.layers = [...json.layers]
+        json.layers = [...(json.layers ?? [])]
         const alreadyLoaded = new Set(json.layers.map((l) => l["id"]))
 
         for (const layerName of Constants.added_by_default) {
@@ -480,6 +480,20 @@ class WarnForUnsubstitutedLayersInTheme extends DesugaringStep<LayoutConfigJson>
         if (json.hideFromOverview === true) {
             return json
         }
+        if ((json.layers ?? []).length === 0) {
+            context
+                .enter("layers")
+                .err(
+                    "No layers are defined. You must define at least one layer to have a valid theme"
+                )
+            return json
+        }
+        if (!Array.isArray(json.layers)) {
+            context
+                .enter("layers")
+                .err("Can not iterate over layers in theme, it is a " + JSON.stringify(json.layers))
+            return json
+        }
         for (const layer of json.layers) {
             if (typeof layer === "string") {
                 continue
@@ -537,7 +551,7 @@ export class PrepareTheme extends Fuse<LayoutConfigJson> {
 
     convert(json: LayoutConfigJson, context: ConversionContext): LayoutConfigJson {
         const result = super.convert(json, context)
-        if (this.state.publicLayers.size === 0) {
+        if ((this.state.publicLayers?.size ?? 0) === 0) {
             // THis is a bootstrapping run, no need to already set this flag
             return result
         }

src/Models/ThemeConfig/Conversion/Validation.ts

@@ -129,7 +129,7 @@ export class DoesImageExist extends DesugaringStep<string> {
     }
 }
 
-class ValidateTheme extends DesugaringStep<LayoutConfigJson> {
+export class ValidateTheme extends DesugaringStep<LayoutConfigJson> {
     /**
      * The paths where this layer is originally saved. Triggers some extra checks
      * @private
@@ -176,6 +176,9 @@ class ValidateTheme extends DesugaringStep<LayoutConfigJson> {
                 }
             }
         }
+        if (!json.title) {
+            context.enter("title").err(`The theme ${json.id} does not have a title defined.`)
+        }
         if (this._isBuiltin && this._extractImages !== undefined) {
             // Check images: are they local, are the licenses there, is the theme icon square, ...
             const images = this._extractImages.convert(json, context.inOperation("ValidateTheme"))
@@ -249,6 +252,20 @@ class ValidateTheme extends DesugaringStep<LayoutConfigJson> {
             new DetectDuplicatePresets().convert(theme, context)
         }
 
+        if (!theme.title) {
+            context.enter("title").err("A theme must have a title")
+        }
+
+        if (!theme.description) {
+            context.enter("description").err("A theme must have a description")
+        }
+
+        if (theme.overpassUrl && typeof theme.overpassUrl === "string") {
+            context
+                .enter("overpassUrl")
+                .err("The overpassURL is a string, use a list of strings instead. Wrap it with [ ]")
+        }
+
         return json
     }
 }