Merge pull request #80 from DannyBen/fix/json-schema

Fix JSON schema

Author: DannyBen

.github/workflows/test.yml

@@ -41,37 +41,37 @@ jobs:
     - name: Run tests
       run: bundle exec rspec
 
-  # json_schema:
-  #   name: Validate JSON schema
+  json_schema:
+    name: Validate JSON schema
 
-  #   runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
 
-  #   steps:
-  #   - name: Checkout code
-  #     uses: actions/checkout@v4
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
 
-  #   # Rush needed for easy installation of check-jsonschema
-  #   - name: Install rush
-  #     run: curl -Ls http://get.dannyb.co/rush/setup | bash
+    # Rush needed for easy installation of check-jsonschema
+    - name: Install rush
+      run: curl -Ls http://get.dannyb.co/rush/setup | bash
 
-  #   - name: Connect rush repo
-  #     run: rush clone dannyben --shallow --default
+    - name: Connect rush repo
+      run: rush clone dannyben --shallow --default
 
-  #   - name: Install check-jsonschema
-  #     run: rush get check-jsonschema
+    - name: Install check-jsonschema
+      run: rush get check-jsonschema
 
-  #   # libyaml needed for Ruby's YAML library
-  #   - name: Install OS dependencies
-  #     run: sudo apt-get -y install libyaml-dev
+    # libyaml needed for Ruby's YAML library
+    - name: Install OS dependencies
+      run: sudo apt-get -y install libyaml-dev
 
-  #   - name: Setup Ruby
-  #     uses: ruby/setup-ruby@v1
-  #     with: 
-  #       ruby-version: '3.1'
-  #       bundler-cache: true
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with: 
+        ruby-version: '3.1'
+        bundler-cache: true
 
-  #   - name: Test schema
-  #     run: bundle exec run schema
+    - name: Test schema
+      run: bundle exec run schema
 
   codespell:
     name: Spell check

schemas/completely.json

@@ -1,49 +1,71 @@
 {
-    "$schema": "http://json-schema.org/draft-07/schema",
-    "title": "completion",
-    "description": "A completion of the current application\nhttps://github.com/DannyBen/completely#using-the-completely-command-line",
-    "type": "object",
-    "patternProperties": {
-        ".": {
-            "title": "completions",
-            "description": "Completions of the current command or sub-command\nhttps://github.com/DannyBen/completely#using-the-completely-command-line",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "word": {
+      "type": "string",
+      "minLength": 1,
+      "examples": [
+        "--help",
+        "--version",
+        "-h",
+        "-v",
+        "<alias>",
+        "<arrayvar>",
+        "<binding>",
+        "<builtin>",
+        "<command>",
+        "<directory>",
+        "<disabled>",
+        "<enabled>",
+        "<export>",
+        "<file>",
+        "<function>",
+        "<group>",
+        "<helptopic>",
+        "<hostname>",
+        "<job>",
+        "<keyword>",
+        "<running>",
+        "<service>",
+        "<signal>",
+        "<stopped>",
+        "<user>",
+        "<variable>"
+      ]
+    },
+    "wordOrMapping": {
+      "oneOf": [
+        { "$ref": "#/definitions/word" },
+        {
+          "type": "object",
+          "additionalProperties": {
             "type": "array",
-            "minItems": 1,
-            "uniqueItems": true,
-            "items": {
-                "description": "A completion of the current command or sub-command\nhttps://github.com/DannyBen/completely#using-the-completely-command-line",
-                "type": "string",
-                "minLength": 1,
-                "examples": [
-                    "--help",
-                    "--version",
-                    "-h",
-                    "-v",
-                    "<alias>",
-                    "<arrayvar>",
-                    "<binding>",
-                    "<builtin>",
-                    "<command>",
-                    "<directory>",
-                    "<disabled>",
-                    "<enabled>",
-                    "<export>",
-                    "<file>",
-                    "<function>",
-                    "<group>",
-                    "<helptopic>",
-                    "<hostname>",
-                    "<job>",
-                    "<keyword>",
-                    "<running>",
-                    "<service>",
-                    "<signal>",
-                    "<stopped>",
-                    "<user>",
-                    "<variable>"
-                ]
-            }
+            "items": { "$ref": "#/definitions/wordOrMapping" }
+          }
         }
+      ]
     },
-    "additionalProperties": false
-}
+    "entryArray": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/wordOrMapping" }
+    }
+  },
+  "type": "object",
+  "properties": {
+    "completely_options": {
+      "type": "object",
+      "properties": {
+        "complete_options": {
+          "type": "string",
+          "examples": ["-o nosort"]
+        }
+      },
+      "required": ["complete_options"],
+      "additionalProperties": false
+    }
+  },
+  "patternProperties": {
+    "^(?!completely_options$).*": { "$ref": "#/definitions/entryArray" }
+  },
+  "additionalProperties": false
+}