fix custom properties in schema

DannyBen · Dec 20, 2023 · 63b6982 · 63b6982
1 parent 3691809
commit 63b6982
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 45 deletions.
diff --git a/schemas/bashly.json b/schemas/bashly.json
@@ -1,6 +1,17 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "definitions": {
+    "custom-properties": {
+      "patternProperties": {
+        "^x_.": {
+          "title": "custom property",
+          "description": "A custom property of any type",
+          "examples": [
+            "Anything"
+          ]
+        }
+      }
+    },
     "argument": {
       "title": "argument",
       "description": "A positional argument of the current script or sub-command\nhttps://bashly.dannyb.co/configuration/argument/",
@@ -100,15 +111,6 @@
           }
         }
       },
-      "patternProperties": {
-        "^x_.": {
-          "title": "custom property",
-          "description": "A custom property of any type",
-          "examples": [
-            "Anything"
-          ]
-        }
-      },
       "additionalProperties": false
     },
     "flag": {
@@ -270,12 +272,14 @@
           }
         }
       },
-      "^x_.": {
-        "title": "custom property",
-        "description": "A custom property of any type",
-        "examples": [
-          "Anything"
-        ]
+      "patternProperties": {
+        "^x_.": {
+          "title": "custom property",
+          "description": "A custom property of any type",
+          "examples": [
+            "Anything"
+          ]
+        }
       },
       "additionalProperties": false
     },
@@ -473,12 +477,14 @@
               "$ref": "#/definitions/environment-variables-required-property"
             }
           },
-          "^x_.": {
-            "title": "custom property",
-            "description": "A custom property of any type",
-            "examples": [
-              "Anything"
-            ]
+          "patternProperties": {
+            "^x_.": {
+              "title": "custom property",
+              "description": "A custom property of any type",
+              "examples": [
+                "Anything"
+              ]
+            }
           },
           "additionalProperties": false
         },
@@ -497,12 +503,14 @@
               "$ref": "#/definitions/environment-variables-required-property"
             }
           },
-          "^x_.": {
-            "title": "custom property",
-            "description": "A custom property of any type",
-            "examples": [
-              "Anything"
-            ]
+          "patternProperties": {
+            "^x_.": {
+              "title": "custom property",
+              "description": "A custom property of any type",
+              "examples": [
+                "Anything"
+              ]
+            }
           },
           "additionalProperties": false
         }
@@ -861,12 +869,14 @@
           "$ref": "#/definitions/sub-command-import-property"
         }
       },
-      "^x_.": {
-        "title": "custom property",
-        "description": "A custom property of any type",
-        "examples": [
-          "Anything"
-        ]
+      "patternProperties": {
+        "^x_.": {
+          "title": "custom property",
+          "description": "A custom property of any type",
+          "examples": [
+            "Anything"
+          ]
+        }
       },
       "additionalProperties": false
     }
@@ -924,12 +934,14 @@
       "$ref": "#/definitions/function-property"
     }
   },
-  "^x_.": {
-    "title": "custom property",
-    "description": "A custom property of any type",
-    "examples": [
-      "Anything"
-    ]
+  "patternProperties": {
+    "^x_.": {
+      "title": "custom property",
+      "description": "A custom property of any type",
+      "examples": [
+        "Anything"
+      ]
+    }
   },
   "additionalProperties": false
 }
diff --git a/schemas/src/bashly.yml b/schemas/src/bashly.yml
@@ -1,5 +1,12 @@
 $schema: http://json-schema.org/draft-07/schema
 definitions:
+  custom-properties: &custom-properties
+    patternProperties:
+      ^x_.:
+        title: custom property
+        description: A custom property of any type
+        examples:
+          - Anything
   argument:
     title: argument
     description: |-
@@ -91,12 +98,6 @@ definitions:
         properties:
           repeatable:
             const: true
-    patternProperties: &custom-properties
-      ^x_.:
-        title: custom property
-        description: A custom property of any type
-        examples:
-          - Anything
     additionalProperties: false
   flag:
     title: flag