@json-editor/json-editor 2.5.4 → 2.6.0

package/tests/fixtures/validation.json

@@ -1136,5 +1136,212 @@
                "charlie": { "type": "string" }
            }
         ]
+    },
+    "nested_anyOf": {
+      "schema": {
+        "type": "object",
+        "properties": {
+          "prop": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/A"
+              },
+              {
+                "$ref": "#/definitions/B"
+              }
+            ]
+          }
+        },
+        "definitions": {
+          "A": {
+            "title": "A",
+            "type": "object",
+            "properties": {
+              "fooA": {
+                "type": "string"
+              },
+              "barA": {
+                "type": "string"
+              },
+              "common": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "fooA",
+              "barA"
+            ]
+          },
+          "B": {
+            "title": "B",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/C"
+              },
+              {
+                "$ref": "#/definitions/D"
+              }
+            ]
+          },
+          "C": {
+            "title": "C",
+            "type": "object",
+            "properties": {
+              "fooC": {
+                "type": "string"
+              },
+              "barC": {
+                "type": "string"
+              },
+              "common": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "fooC",
+              "barC"
+            ]
+          },
+          "D": {
+            "title": "D",
+            "type": "object",
+            "properties": {
+              "fooD": {
+                "type": "string"
+              },
+              "barD": {
+                "type": "string"
+              }
+            },
+            "required": [
+              "fooD",
+              "barD"
+            ]
+          }
+        }
+      },
+      "valid": [
+        {
+          "prop": {
+            "fooC": "foo",
+            "barC": "bar",
+            "common": "common"
+          }
+        },
+        {
+          "prop": {
+            "fooD": "foo",
+            "barD": "bar",
+            "common": "common"
+          }
+        },
+        {
+          "prop": {
+            "fooA": "foo",
+            "barA": "bar",
+            "common": "common"
+          }
+        }
+      ],
+      "invalid": [
+        {
+          "prop": {
+            "common": "common"
+          }
+        }
+      ]
+    },
+    "anyOf_invalid_better_fit_test": {
+        "schema": {
+            "type": "object",
+            "properties": {
+                "foo": {
+                  "anyOf": [
+                      {
+                          "$ref": "#/definitions/A"
+                      },
+                      {
+                          "$ref": "#/definitions/B"
+                      }
+                  ]
+                }
+            },
+            "definitions": {
+                "A": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "enum": [
+                                "A"
+                            ],
+                            "type": "string"
+                        },
+                        "referenced": {
+                            "$ref": "#/definitions/ReferencedObject"
+                        }
+                    },
+                    "required": [
+                        "type"
+                    ]
+                },
+                "B": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "enum": [
+                                "B"
+                            ],
+                            "type": "string"
+                        },
+                        "referenced": {
+                          "properties": {
+                          "foo": {
+                            "type": "string"
+                          },
+                          "bar": {
+                            "type": "string"
+                          }
+                        },
+                          "type": "object"
+                        }
+                    },
+                    "required": [
+                        "type"
+                    ]
+                  },
+                "ReferencedObject": {
+                  "properties": {
+                    "foo": {
+                      "type": "string"
+                    },
+                    "bar": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
+                }
+                }
+            },
+        "valid": [
+          {
+            "foo": {
+              "type": "A",
+              "referenced": {
+                "foo": "",
+                "bar": ""
+              }
+            }
+          },
+          {
+            "foo": {
+              "type": "B",
+              "referenced": {
+                "foo": "",
+                "bar": ""
+              }
+            }
+          }
+        ],
+      "invalid": []
     }
 }

package/tests/pages/meta_schema.json

@@ -75,7 +75,6 @@
           "enum":[
             "color",
             "date",
-            "datetime",
             "datetime-local",
             "email",
             "month",

package/tests/pages/object-required-properties.html

@@ -62,22 +62,33 @@
         "type": "string",
         "minLength": 5,
         "options": {
-          "grid_columns": 4
+          "grid_columns": 3
         }
       },
       "number": {
         "title": "number",
         "type": "number",
         "options": {
-          "grid_columns": 4
+          "grid_columns": 3
         }
       },
       "boolean": {
         "title": "boolean",
         "type": "boolean",
         "options": {
-          "grid_columns": 4,
-          "grid_break": true
+          "grid_columns": 3,
+        }
+      },
+      "radio": {
+        "type": "string",
+        "format": "radio",
+        "title": "Radio Buttons",
+        "enum": [
+          "Home",
+          "Work"
+        ],
+        "options": {
+          "grid_columns": 3
         }
       },
       "array": {
@@ -106,21 +117,33 @@
             "title": "string",
             "type": "string",
             "options": {
-              "grid_columns": 4
+              "grid_columns": 3
             }
           },
           "number": {
             "title": "number",
             "type": "number",
             "options": {
-              "grid_columns": 4
+              "grid_columns": 3
             }
           },
           "boolean": {
             "title": "boolean",
             "type": "boolean",
             "options": {
-              "grid_columns": 4
+              "grid_columns": 3
+            }
+          },
+          "radio": {
+            "type": "string",
+            "format": "radio",
+            "title": "Radio Buttons",
+            "enum": [
+              "Home",
+              "Work"
+            ],
+            "options": {
+              "grid_columns": 3
             }
           },
           "array": {

package/tests/pages/object-show-opt-in.html

@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Object Required Properties</title>
+    <meta charset="utf-8"/>
+      <script src="../../dist/jsoneditor.js"></script>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
+</head>
+<body>
+
+<div class="container">
+    <label for="show-opt-in">
+        <span>show_opt_in</span>
+        <input id="show-opt-in" type="checkbox">
+    </label>
+    <div id='json-editor-container'></div>
+    <label for="value"></label>
+    <textarea id="value" class="value" style="width: 100%; height: 300px;"></textarea>
+    <button id='get-value'>get value</button>
+    <button id='get-formatted-value'>get formatted value</button>
+</div>
+
+<script>
+  var container = document.querySelector('#json-editor-container')
+  var value = document.querySelector('#value')
+  var getValue = document.querySelector('#get-value')
+  var getFormattedValue = document.querySelector('#get-formatted-value')
+  var showOptIn = document.querySelector('#show-opt-in')
+  var schema = {
+    'type': 'object',
+    'title': 'option_show_opt_in_false',
+    'options': {
+      'show_opt_in': false
+    },
+    'properties': {
+      'option_show_opt_in_undefined': {
+        'type': 'object',
+        'title': 'option_show_opt_in_undefined',
+        'properties': {
+          'string': {
+            'title': 'optional_string',
+            'type': 'string'
+          }
+        }
+      },
+      'option_show_opt_in_true': {
+        'type': 'object',
+        'title': 'option_show_opt_in_true',
+        'options': {
+          'show_opt_in': true
+        },
+        'properties': {
+          'string': {
+            'title': 'optional_string',
+            'type': 'string'
+          }
+        }
+      },
+      'option_show_opt_in_false': {
+        'type': 'object',
+        'title': 'option_show_opt_in_false',
+        'options': {
+          'show_opt_in': false
+        },
+        'properties': {
+          'string': {
+            'title': 'optional_string',
+            'type': 'string'
+          }
+        }
+      }
+    }
+  }
+
+  window.addEventListener('DOMContentLoaded', function () {
+
+    var editor = null
+
+    var initJSONEditor = function (show_opt_in) {
+      if (editor) {
+        editor.destroy()
+      }
+
+      editor = new JSONEditor(container, {
+        schema: schema,
+        theme: 'bootstrap4',
+        disable_collapse: true,
+        disable_edit_json: true,
+        show_opt_in: show_opt_in || false
+      })
+    }
+
+    initJSONEditor(false)
+
+    showOptIn.addEventListener('click', function (event) {
+      initJSONEditor(event.target.checked)
+    })
+
+    getValue.addEventListener('click', function () {
+      value.value = JSON.stringify(editor.getValue())
+    })
+
+    getFormattedValue.addEventListener('click', function () {
+      value.value = JSON.stringify(editor.getValue(), null, 2)
+    })
+  })
+</script>
+
+</body>
+</html>

package/tests/pages/stepper-manual.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>Stepper</title>
+  <link rel="stylesheet" id="theme-link" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
+  <link rel="stylesheet" id="iconlib-link" href="https://use.fontawesome.com/releases/v5.6.1/css/all.css">
+  <script src="https://cdn.jsdelivr.net/npm/mathjs@5.3.1/dist/math.min.js" class="external_mathjs"></script>
+  <script src="../../dist/jsoneditor.js"></script>
+</head>
+<body>
+
+<div class="container">
+  <textarea class="value form-control" rows="10"></textarea>
+  <button class='get-value'>Get Value</button>
+  <button class='set-value'>Set Value</button>
+  <div class='json-editor-container'></div>
+</div>
+
+
+<script>
+  var jsonEditorContainer = document.querySelector('.json-editor-container');
+  var value = document.querySelector('.value');
+
+  var schema = {
+    "type": "object",
+    "title": "range",
+    "properties": {
+      "stepper": {
+        'type': 'integer',
+        'format': 'stepper',
+        "default": ""
+      }
+    }
+  };
+
+  var editor = new JSONEditor(jsonEditorContainer, {
+    schema: schema,
+    theme: 'bootstrap4',
+    use_default_values: false,
+    required_by_default: true,
+    show_errors: 'always'
+  });
+
+  document.querySelector('.get-value').addEventListener('click', function () {
+    value.value = JSON.stringify(editor.getValue());
+    console.log(editor.getValue());
+  });
+
+  document.querySelector('.set-value').addEventListener('click', function () {
+    editor.setValue({number_range: 2})
+  });
+
+</script>
+
+</body>
+</html>

package/tests/unit/validator.spec.js

@@ -8,6 +8,7 @@ import fixtureString from '../fixtures/string.json'
 import fixtureRecursive from '../fixtures/recursive.json'
 import * as math from 'mathjs'
 import { createFakeServer } from 'sinon'
+import * as deepEqual from 'fast-deep-equal';
 
 describe('Validator', () => {
   it('mathjs test', () => {
@@ -79,6 +80,15 @@ describe('Validation Test', () => {
             done()
           })
         })
+
+        it(`does not change valid data ${i + 1}`, (done) => {
+          editor.on('ready', () => {
+            editor.setValue(v)
+            expect(deepEqual(editor.getValue(), v)).toBe(true)
+            done()
+          })
+        })
+
       })
       spec.invalid.forEach((v, i) => {
         it(`invalid data ${i + 1}`, (done) => {