Feature/fixes2 (#26)

* fixed issues * merged * sync
jhipster · Mar 12, 2021 · 944f1cf · 944f1cf
1 parent 6266fcd
commit 944f1cf
Show file tree

Hide file tree

Showing 8 changed files with 129 additions and 135 deletions.
diff --git a/JDLApplicationOptions.md b/JDLApplicationOptions.md
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 files=$(find src -name *.json ! -path "*.schema.*" | awk -F/ '{ print $NF }' | cut -d '.' -f 1)
 
 for f in $files

diff --git a/src/JDLApplicationOptions.schema.json b/src/JDLApplicationOptions.schema.json
@@ -29,7 +29,6 @@
             }
         ]
     ],
-    "additionalItems": true,
     "items": {
         "anyOf": [
             {
@@ -102,7 +101,6 @@
                                 "microservice"
                             ]
                         ],
-                        "additionalItems": true,
                         "items": {
                             "anyOf": [
                                 {

diff --git a/src/JDLDeploymentOptions.schema.json b/src/JDLDeploymentOptions.schema.json
@@ -5,7 +5,6 @@
     "title": "The root schema",
     "description": "The root schema comprises the entire JSON document.",
     "default": [],
-    "additionalItems": true,
     "items": {
         "$id": "#/items",
         "anyOf": [
@@ -76,7 +75,6 @@
                                 "\"docker push\""
                             ]
                         ],
-                        "additionalItems": true,
                         "items": {
                             "$id": "#/items/anyOf/0/properties/values/items",
                             "anyOf": [

diff --git a/src/JDLFields.schema.json b/src/JDLFields.schema.json
@@ -5,7 +5,6 @@
     "title": "The Root Schema",
     "description": "The root schema comprises the entire JSON document.",
     "default": [],
-    "additionalItems": true,
     "items": {
         "$id": "#/items",
         "type": "object",

diff --git a/src/JDLLanguages.schema.json b/src/JDLLanguages.schema.json
@@ -5,7 +5,6 @@
     "title": "The Root Schema",
     "description": "The root schema comprises the entire JSON document.",
     "default": [],
-    "additionalItems": true,
     "items": {
         "$id": "#/items",
         "type": "object",

diff --git a/src/JDLOptions.schema.json b/src/JDLOptions.schema.json
@@ -5,7 +5,6 @@
     "title": "The Root Schema",
     "description": "The root schema comprises the entire JSON document.",
     "default": [],
-    "additionalItems": true,
     "items": {
         "$id": "#/items",
         "type": "object",
@@ -95,7 +94,6 @@
                         "no"
                     ]
                 ],
-                "additionalItems": true,
                 "items": {
                     "$id": "#/items/properties/values/items",
                     "type": "string",

diff --git a/src/JDLValidations.schema.json b/src/JDLValidations.schema.json
@@ -2,106 +2,106 @@
     "$schema": "http://json-schema.org/draft-07/schema",
     "$id": "http://example.com/example.json",
     "type": "array",
-    "title": "The Root Schema",
+    "title": "The root schema",
     "description": "The root schema comprises the entire JSON document.",
     "default": [],
-    "additionalItems": true,
-    "items": {
-        "$id": "#/items",
-        "type": "object",
-        "title": "The Items Schema",
-        "description": "An explanation about the purpose of this instance.",
-        "default": {},
-        "examples": [
+    "examples": [
+        [
             {
-                "code": "UNIQUE",
-                "name": "unique",
+                "code": "REQUIRED",
+                "name": "required",
                 "baseType": "BOOLEAN",
                 "parseType": "Boolean",
                 "valueIsRequired": false
             },
             {
-                "code": "MIN",
-                "name": "min",
-                "baseType": "INTEGER",
-                "parseType": "Number",
-                "valueIsRequired": true
-            },
-            {
-                "code": "PATTERN",
-                "name": "pattern",
-                "baseType": "STRING",
-                "parseType": "RegExp",
-                "valueIsRequired": true
+                "code": "UNIQUE",
+                "name": "unique",
+                "baseType": "BOOLEAN",
+                "parseType": "Boolean",
+                "valueIsRequired": false
             }
-        ],
-        "additionalProperties": true,
-        "required": [
-            "code",
-            "name",
-            "baseType",
-            "parseType"
-        ],
-        "properties": {
-            "code": {
-                "$id": "#/items/properties/code",
-                "type": "string",
-                "title": "The Code Schema",
-                "description": "The code is the internal ID for the validation object.",
-                "default": "",
-                "examples": [
-                    "REQUIRED",
-                    "MIN",
-                    "PATTERN"
-                ]
-            },
-            "name": {
-                "$id": "#/items/properties/name",
-                "type": "string",
-                "title": "The Name Schema",
-                "description": "The name is the validation's visible name.",
-                "default": "",
-                "examples": [
-                    "required",
-                    "min",
-                    "pattern"
-                ]
-            },
-            "baseType": {
-                "$id": "#/items/properties/baseType",
-                "type": "string",
-                "title": "The baseType Schema",
-                "description": "The validation's baseType refers to the value type, either STRING, INTEGER or BOOLEAN.",
-                "default": "",
-                "examples": [
-                    "STRING",
-                    "INTEGER",
-                    "BOOLEAN"
-                ]
-            },
-            "parseType": {
-                "$id": "#/items/properties/parseType",
-                "type": "string",
-                "title": "The parseType Schema",
-                "description": "The validation's parseType refers to what the value can be parsed to.",
-                "default": "",
-                "examples": [
-                    "RegExp",
-                    "Number",
-                    "String"
-                ]
-            },
-            "valueIsRequired": {
-                "$id": "#/items/properties/valueIsRequired",
-                "type": "boolean",
-                "title": "The valueIsRequired Schema",
-                "description": "Whether the validation requires a value.",
-                "default": "",
+        ]
+    ],
+    "items": {
+        "$id": "#/items",
+        "anyOf": [
+            {
+                "$id": "#/items/anyOf/0",
+                "type": "object",
+                "title": "The first anyOf schema",
+                "description": "An explanation about the purpose of this instance.",
+                "default": {},
                 "examples": [
-                    true,
-                    false
-                ]
+                    {
+                        "code": "REQUIRED",
+                        "name": "required",
+                        "baseType": "BOOLEAN",
+                        "parseType": "Boolean",
+                        "valueIsRequired": false
+                    }
+                ],
+                "required": [
+                    "code",
+                    "name",
+                    "baseType",
+                    "parseType",
+                    "valueIsRequired"
+                ],
+                "properties": {
+                    "code": {
+                        "$id": "#/items/anyOf/0/properties/code",
+                        "type": "string",
+                        "title": "The code schema",
+                        "description": "An explanation about the purpose of this instance.",
+                        "default": "",
+                        "examples": [
+                            "REQUIRED"
+                        ]
+                    },
+                    "name": {
+                        "$id": "#/items/anyOf/0/properties/name",
+                        "type": "string",
+                        "title": "The name schema",
+                        "description": "An explanation about the purpose of this instance.",
+                        "default": "",
+                        "examples": [
+                            "required"
+                        ]
+                    },
+                    "baseType": {
+                        "$id": "#/items/anyOf/0/properties/baseType",
+                        "type": "string",
+                        "title": "The baseType schema",
+                        "description": "An explanation about the purpose of this instance.",
+                        "default": "",
+                        "examples": [
+                            "BOOLEAN"
+                        ]
+                    },
+                    "parseType": {
+                        "$id": "#/items/anyOf/0/properties/parseType",
+                        "type": "string",
+                        "title": "The parseType schema",
+                        "description": "An explanation about the purpose of this instance.",
+                        "default": "",
+                        "examples": [
+                            "Boolean"
+                        ]
+                    },
+                    "valueIsRequired": {
+                        "$id": "#/items/anyOf/0/properties/valueIsRequired",
+                        "type": "boolean",
+                        "title": "The valueIsRequired schema",
+                        "description": "An explanation about the purpose of this instance.",
+                        "default": false,
+                        "examples": [
+                            false
+                        ]
+                    }
+                },
+                "additionalProperties": true
             }
-        }
+        ]
     }
-}
+}