Allow presets blocks as hash

Shopify · Nov 4, 2024 · d86120a · d86120a
1 parent 18f28fc
commit d86120a
Showing 1 changed file with 62 additions and 42 deletions.
diff --git a/schemas/theme/section.json b/schemas/theme/section.json
@@ -111,48 +111,10 @@
             "$ref": "./default_setting_values.json"
           },
           "blocks": {
-            "type": "array",
-            "description": "Default blocks configurations to ship with this preset.",
-            "markdownDescription": "Default blocks configurations to ship with this preset.\n\n---\n\n[Shopify reference](https://shopify.dev/docs/themes/architecture/sections/section-schema#presets)",
-            "items": {
-              "type": "object",
-              "required": ["type"],
-              "additionalProperties": false,
-              "properties": {
-                "static": {
-                  "type": "boolean",
-                  "description": "If the block is rendered statically or not"
-                },
-                "id": {
-                  "type": "string"
-                },
-                "type": {
-                  "type": "string",
-                  "description": "The block type."
-                },
-                "settings": {
-                  "$ref": "./default_setting_values.json"
-                },
-                "blocks": {
-                  "$ref": "#/properties/presets/items/properties/blocks"
-                }
-              },
-              "allOf": [
-                {
-                  "if": {
-                    "properties": {
-                      "static": {
-                        "const": true
-                      }
-                    },
-                    "required": ["static"]
-                  },
-                  "then": {
-                    "required": ["id"]
-                  }
-                }
-              ]
-            }
+            "oneOf": [
+              { "$ref": "#/definitions/blocks_array" },
+              { "$ref": "#/definitions/blocks_hash" }
+            ]
           }
         }
       }
@@ -258,6 +220,64 @@
           "uniqueItems": true
         }
       }
+    },
+    "blocks_array": {
+      "type": "array",
+      "description": "A list of child blocks that you might want to include.",
+      "markdownDescription": "A list of child blocks that you might want to include.\n\n---\n\n[Shopify reference](https://shopify.dev/docs/themes/architecture/blocks/theme-blocks/schema#presets)",
+      "required": ["type"],
+      "items": {
+        "type": "object",
+        "properties": {
+          "$ref": "#/definitions/base_block",
+          "id": {
+            "type": "string"
+          }
+        },
+        "allOf": [
+          {
+            "if": {
+              "properties": {
+                "static": {
+                  "const": true
+                }
+              },
+              "required": ["static"]
+            },
+            "then": {
+              "required": ["id"]
+            }
+          }
+        ]
+      }
+    },
+    "blocks_hash": {
+      "type": "object",
+      "description": "A list of child blocks that you might want to include.",
+      "markdownDescription": "A list of child blocks that you might want to include.\n\n---\n\n[Shopify reference](https://shopify.dev/docs/themes/architecture/blocks/theme-blocks/schema#presets)",
+      "additionalProperties": {
+        "$ref": "#/definitions/base_block"
+      }
+    },
+    "base_block": {
+      "type": "object",
+      "required": ["type"],
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "The block type."
+        },
+        "settings": {
+          "$ref": "./default_setting_values.json"
+        },
+        "blocks": {
+          "$ref": "#/properties/presets/items/properties/blocks"
+        },
+        "static": {
+          "type": "boolean",
+          "description": "If the block is rendered statically or not"
+        }
+      }
     }
   }
 }