update shared block attributes

Author: miazbikowski

schemas/theme/section.json

@@ -112,8 +112,8 @@
           },
           "blocks": {
             "oneOf": [
-              { "$ref": "#/definitions/blocks_array" },
-              { "$ref": "#/definitions/blocks_hash" }
+              { "$ref": "#/definitions/blocksArray" },
+              { "$ref": "#/definitions/blocksHash" }
             ]
           }
         }
@@ -221,61 +221,46 @@
         }
       }
     },
-    "blocks_array": {
+    "blocksArray": {
       "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"],
+      "markdownDescription": "A list of child blocks that you might want to include.\n\n---\n\n[Shopify reference](https://shopify.dev/docs/themes/architecture/sections/section-schema#presets)",
       "items": {
         "type": "object",
         "properties": {
-          "$ref": "#/definitions/base_block",
-          "id": {
-            "type": "string"
-          }
-        },
-        "allOf": [
-          {
-            "if": {
-              "properties": {
-                "static": {
-                  "const": true
-                }
-              },
-              "required": ["static"]
-            },
-            "then": {
-              "required": ["id"]
+          "type": "object",
+          "allOf": [{ "$ref": "#/definitions/commonBlockAttributes" }],
+          "properties": {
+            "static": true,
+            "type": true,
+            "settings": true,
+            "blocks": true,
+            "id": {
+              "type": "string",
+              "description": "A unique identifier for the block."
             }
-          }
-        ]
+          },
+          "additionalProperties": false
+        },
+        "if": {
+          "properties": {
+            "static": { "const": true }
+          },
+          "required": ["static"]
+        },
+        "then": {
+          "required": ["id"]
+        }
       }
     },
-    "blocks_hash": {
+    "blocksHash": {
       "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)",
+      "markdownDescription": "A list of child blocks that you might want to include.\n\n---\n\n[Shopify reference](https://shopify.dev/docs/themes/architecture/sections/section-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"
+        "type": "object",
+        "properties": {
+          "$ref": "./theme_block.json#/definitions/commonBlockAttributes"
         }
       }
     }

schemas/theme/theme_block.json

@@ -73,8 +73,8 @@
           },
           "blocks": {
             "oneOf": [
-              { "$ref": "#/definitions/blocks_array" },
-              { "$ref": "#/definitions/blocks_hash" }
+              { "$ref": "#/definitions/blocksArray" },
+              { "$ref": "#/definitions/blocksHash" }
             ]
           }
         }
@@ -106,45 +106,50 @@
     }
   },
   "definitions": {
-    "blocks_array": {
+    "blocksArray": {
       "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"]
+          "type": "object",
+          "allOf": [{ "$ref": "#/definitions/commonBlockAttributes" }],
+          "properties": {
+            "static": true,
+            "type": true,
+            "settings": true,
+            "blocks": true,
+            "id": {
+              "type": "string",
+              "description": "A unique identifier for the block."
             }
-          }
-        ]
+          },
+          "additionalProperties": false
+        },
+        "if": {
+          "properties": {
+            "static": { "const": true }
+          },
+          "required": ["static"]
+        },
+        "then": {
+          "required": ["id"]
+        }
       }
     },
-    "blocks_hash": {
+    "blocksHash": {
       "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"
-      }
+      "patternProperties": {
+        "^[a-zA-Z0-9_-]+$": {
+          "allOf": [{ "$ref": "#/definitions/commonBlockAttributes" }]
+        }
+      },
+      "additionalProperties": false
     },
-    "base_block": {
+    "commonBlockAttributes": {
       "type": "object",
       "required": ["type"],
       "properties": {
@@ -160,7 +165,7 @@
         },
         "static": {
           "type": "boolean",
-          "description": "If the block is rendered statically or not"
+          "description": "If the block is rendered statically or not."
         }
       }
     }