format

demo/docs.json

 [
 "docs/1_clean_document.json",
+"docs/bad_circular_A_schema.json",
+"docs/bad_circular_B_schema.json",
+"docs/bad_circular_C_schema.json",
+"docs/circular_A_schema.json",
+"docs/circular_B_schema.json",
+"docs/circular_C_schema.json",
 "docs/demo.json",
 "docs/xmla_settings_schema.json"
 ]

demo/docs/bad_circular_A_schema.json

+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Settings for XMLA connection",
+  "properties": {
+    "url": {
+      "uniqueItems": true,
+      "items": {
+        "$ref": "bad_circular_B_schema.json"
+      },
+      "minItems": 1,
+      "type": "array"
+    },
+    "username": {
+      "type": "string"
+    },
+    "password": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "url"
+  ],
+  "additionalProperties": false
+}
\ No newline at end of file

demo/docs/bad_circular_B_schema.json

+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Settings for XMLA connection",
+  "properties": {
+    "url": {
+      "uniqueItems": true,
+      "items": {
+        "$ref": "bad_circular_C_schema.json"
+      },
+      "minItems": 1,
+      "type": "array"
+    },
+    "username": {
+      "type": "string"
+    },
+    "password": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "url"
+  ],
+  "additionalProperties": false
+}
\ No newline at end of file

demo/docs/bad_circular_C_schema.json

+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Settings for XMLA connection",
+  "properties": {
+    "url": {
+      "uniqueItems": true,
+      "items": {
+        "$ref": "bad_circular_A_schema.json"
+      },
+      "minItems": 1,
+      "type": "array"
+    },
+    "username": {
+      "type": "string"
+    },
+    "password": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "url"
+  ],
+  "additionalProperties": false
+}
\ No newline at end of file

demo/docs/circular_A_schema.json

+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Settings for XMLA connection",
+  "properties": {
+    "url": {
+      "uniqueItems": true,
+      "items": {
+        "$ref": "circular_B_schema.json"
+      },
+      "minItems": 1,
+      "type": "array"
+    },
+    "username": {
+      "type": "string"
+    },
+    "password": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "url"
+  ],
+  "additionalProperties": false
+}
\ No newline at end of file

demo/docs/circular_B_schema.json

+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Settings for XMLA connection",
+  "properties": {
+    "url": {
+      "uniqueItems": true,
+      "items": {
+        "$ref": "circular_C_schema.json"
+      },
+      "minItems": 0,
+      "type": "array"
+    },
+    "username": {
+      "type": "string"
+    },
+    "password": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "url"
+  ],
+  "additionalProperties": false
+}
\ No newline at end of file

demo/docs/circular_C_schema.json

+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Settings for XMLA connection",
+  "properties": {
+    "url": {
+      "uniqueItems": true,
+      "items": {
+        "$ref": "circular_A_schema.json"
+      },
+      "minItems": 1,
+      "type": "array"
+    },
+    "username": {
+      "type": "string"
+    },
+    "password": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "url"
+  ],
+  "additionalProperties": false
+}
\ No newline at end of file

demo/schemas.json

@@ -22,6 +22,9 @@
 "slapos/software/cloudooo/instance-cloudooo-input-schema.json",
 "slapos/software/cloudooo/software.cfg.json",
 "slapos/software/cloudooo/instance-cloudooo-output-schema.json",
+"slapos/software/proftpd/instance-output-schema.json",
+"slapos/software/proftpd/software.cfg.json",
+"slapos/software/proftpd/instance-input-schema.json",
 "slapos/software/re6stnet/software.cfg.json",
 "slapos/software/re6stnet/instance-re6stnet-output-schema.json",
 "slapos/software/re6stnet/instance-re6stnet-slave-input-schema.json",

gadget_json_generated_form.js

@@ -16,45 +16,75 @@
     return _str.replace(/~/g, '~0').replace(/\//g, '~1');
   }
 
-  function convertToRealWorldSchemaPath(g, path) {
-    var base_url,
+  function getMaxPathInDict(dict, path) {
+    var target,
       key,
-      hash,
-      map = g.props.schema_map,
       max_len = 0;
     if (!path) {
       return "";
     }
-    for (key in map) {
-      if (map.hasOwnProperty(key) &&
+    for (key in dict) {
+      if (dict.hasOwnProperty(key) &&
           path.startsWith(key) &&
           key.length > max_len) {
-        base_url = map[key];
+        target = key;
         max_len = key.length;
       }
     }
-    if (base_url === undefined) {
-      base_url = "";
+    return target;
+  }
+
+  function checkCircular(g, path, url) {
+    var required_stack,
+      prev_field_path = getMaxPathInDict(g.props.schema_required_urls, path);
+    required_stack = g.props.schema_required_urls[prev_field_path] || [];
+    if (required_stack.indexOf(url) >= 0) {
+      throw new Error("Circular reference detected");
+    }
+    g.props.schema_required_urls[path] = [url].concat(required_stack);
+  }
+
+  function convertToRealWorldSchemaPath(g, path) {
+    var url,
+      hash,
+      map = g.props.schema_map,
+      prev_downl_path,
+      max_len = 0;
+    if (!path) {
+      return "";
+    }
+    // previous downloaded path
+    prev_downl_path = getMaxPathInDict(map, path);
+    if (prev_downl_path === undefined) {
+      url = "";
       max_len = 1;
+    } else {
+      url = map[prev_downl_path];
+      max_len = prev_downl_path.length;
     }
     hash = path.substr(max_len - 1);
     if (hash) {
       // XXX urlencode for hash
-      if (base_url.indexOf("#") >= 0) {
-        base_url = base_url + hash;
+      if (url.indexOf("#") >= 0) {
+        url = url + hash;
       } else {
-        base_url = base_url + "#" + path.substr(max_len - 1);
+        url = url + "#" + path.substr(max_len - 1);
       }
     }
-    return base_url;
+    return url;
   }
 
-  function getBaseUrl(g, path) {
-    var ret = convertToRealWorldSchemaPath(g, path);
-    if (ret.indexOf("#") === 0) {
-      return;
+  function convertUrlToAbsolute(g, path, url, base_url_failback) {
+    var // previous downloaded path
+      base_url = convertToRealWorldSchemaPath(g, path),
+      absolute_url;
+    if (base_url === "" || base_url.indexOf("#") === 0) {
+      absolute_url = new URL(url, base_url_failback);
+    } else {
+      absolute_url = new URL(url, base_url);
     }
-    return ret;
+    checkCircular(g, path, absolute_url.href);
+    return absolute_url;
   }
 
   function downloadJSON(url) {
@@ -372,7 +402,14 @@
       });
   };
 
-  function expandProperties(g, properties, schema_path) {
+  function expandSchemaForField(g, schema, schema_path, for_required) {
+    return g.markSchemaFieldAsRequired(schema_path, for_required)
+      .push(function () {
+        return expandSchema(g, schema, schema_path);
+      });
+  }
+
+  function expandProperties(g, properties, schema_path, required) {
     var ret_obj = {};
     return RSVP.Queue()
       .push(function () {
@@ -386,8 +423,11 @@
         for (property_name in properties) {
           if (properties.hasOwnProperty(property_name)) {
             arr.push(
-              expandSchema(g, properties[property_name],
-                schema_path + encodeJsonPointer(property_name))
+              expandSchemaForField(g,
+                properties[property_name],
+                schema_path + encodeJsonPointer(property_name),
+                required.indexOf(property_name) >= 0
+                )
                 .push(addPropertyName(property_name))
             );
           }
@@ -665,7 +705,8 @@
   function render_array(gadget, schema, json_document, root, path, schema_path) {
     var div,
       div_input,
-      input;
+      input,
+      minItems = schema.minItems || 0;
     div = document.createElement("div");
     div.setAttribute("class", "subfield");
     div.title = schema.description;
@@ -687,11 +728,10 @@
 
     // XXX add failback rendering if json_document not array
     // input = render_textarea(schema, default_value, "array");
-    return expandSchema(gadget, schema.items, schema_path + '/items')
+    return expandSchemaForField(gadget, schema.items, schema_path + '/items', minItems !== 0)
       .push(function (schema_arr) {
         var queue = RSVP.Queue(),
           i,
-          minItems = schema.minItems || 0,
           len = 0;
         // XXX rewrite loading document for anyOf schema
         if (json_document) {
@@ -932,7 +972,7 @@
     input.placeholder = "name of " + title;
     div_input.appendChild(input);
 
-    return expandSchema(g, schema, schema_path)
+    return expandSchemaForField(g, schema, schema_path)
       .push(function (schema_arr) {
         var queue = RSVP.Queue(),
           property_name;
@@ -998,7 +1038,7 @@
       default_dict = {};
     }
 
-    return expandProperties(g, json_field.properties, schema_path + '/properties/')
+    return expandProperties(g, json_field.properties, schema_path + '/properties/', required)
       .push(function (ret) {
         var schema_arr,
           q = RSVP.Queue(),
@@ -1600,22 +1640,16 @@
       var g = this,
         protocol,
         download_url,
-        base_url,
         hash,
         schema_url_map;
       if (!g.props.toplevel) {
         return g.loadJSONSchemaParent(url, path);
       }
       // XXX need use $id
-      base_url = getBaseUrl(g, path);
-      if (!base_url) {
-        // allow relative link
-        base_url = window.location;
-      }
       if (!path) {
         path = "/";
       }
-      url = new URL(url, base_url);
+      url = convertUrlToAbsolute(g, path, url, window.location);
       download_url = url.origin + url.pathname;
       schema_url_map = {
         "http://json-schema.org/draft-04/schema": "json-schema/schema4.json",
@@ -1691,6 +1725,26 @@
     .allowPublicAcquisition("loadJSONSchemaTop", function (arr) {
       return this.loadJSONSchema(arr[0], arr[1]);
     })
+    .declareMethod("markSchemaFieldAsRequired", function (schema_path, for_required) {
+      var g = this,
+        required_stack,
+        prev_field_path;
+      if (!g.props.toplevel) {
+        return g.markSchemaFieldAsRequiredParent(schema_path, for_required);
+      }
+      // previous downloaded path
+      if (for_required) {
+        prev_field_path = getMaxPathInDict(g.props.schema_required_urls, schema_path);
+        required_stack = g.props.schema_required_urls[prev_field_path];
+      } else {
+        required_stack = [];
+      }
+      g.props.schema_required_urls[schema_path] = required_stack;
+    })
+    .declareAcquiredMethod("markSchemaFieldAsRequiredParent", "markSchemaFieldAsRequiredTop")
+    .allowPublicAcquisition("markSchemaFieldAsRequiredTop", function (arr) {
+      return this.markSchemaFieldAsRequired(arr[0], arr[1]);
+    })
     .declareMethod('render', function (options) {
       var g = this;
       g.props.toplevel = true;
@@ -1700,6 +1754,12 @@
       g.props.schema = {};
       g.props.schema_map = {};
       g.props.schema_cache = {};
+      // schema_required_urls[path] = [
+      // stack required urls, on every unrequired field stack begining from []
+      // "url1",
+      // "url2"
+      // ]
+      g.props.schema_required_urls = {};
       // schema_resolve_errors[schema_url] = {
       //   schemaPath: local_schema_path,
       //   message: error_message can be array containing dom elements