jedison 1.5.0 → 1.6.0

package/dist/esm/jedison.js

@@ -32,7 +32,7 @@ function replaceAll(str, find, replace) {
   return str.replace(new RegExp(escapeRegExp(find), "g"), replace);
 }
 function pathToAttribute(path) {
-  return replaceAll(replaceAll(path, "#", "root"), "/", "-");
+  return replaceAll(replaceAll(path, "#", "root"), "/", "-").replace(/[^a-zA-Z0-9_-]/g, "");
 }
 function hasOwn(obj, prop) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
@@ -220,6 +220,19 @@ function removeDuplicatesFromArray(arr) {
   }
   return uniqueObjects;
 }
+function resolveInstancePath(currentPath, sourcePath) {
+  if (sourcePath.startsWith("#")) return sourcePath;
+  const parts = currentPath.split("/");
+  parts.pop();
+  for (const part of sourcePath.split("/")) {
+    if (part === "..") {
+      if (parts.length > 1) parts.pop();
+    } else if (part !== "." && part !== "") {
+      parts.push(part);
+    }
+  }
+  return parts.join("/");
+}
 function generateRandomID(maxLength2) {
   const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
   let randomID = "";
@@ -510,14 +523,33 @@ function allOf(context) {
   let errors = [];
   const allOf2 = getSchemaAllOf(context.schema);
   if (isSet(allOf2)) {
-    allOf2.forEach((schema) => {
-      const subSchemaErrors = context.validator.getErrors(context.value, schema, context.key, context.path);
-      subSchemaErrors.forEach((error) => {
-        error.path = context.path;
+    const enableSubErrors = getSchemaXOption(context.schema, "subErrors") ?? context.validator.subErrors;
+    if (enableSubErrors) {
+      const schemaResults = [];
+      allOf2.forEach((schema, index2) => {
+        const subSchemaErrors = context.validator.getErrors(context.value, schema, context.key, context.path);
+        if (subSchemaErrors.length > 0) {
+          schemaResults.push({ schemaIndex: index2, errors: subSchemaErrors });
+        }
       });
-      errors.push(...subSchemaErrors);
-    });
-    errors = removeDuplicatesFromArray(errors);
+      if (schemaResults.length > 0) {
+        errors.push({
+          type: "error",
+          path: context.path,
+          constraint: "allOf",
+          subErrors: schemaResults
+        });
+      }
+    } else {
+      allOf2.forEach((schema) => {
+        const subSchemaErrors = context.validator.getErrors(context.value, schema, context.key, context.path);
+        subSchemaErrors.forEach((error) => {
+          error.path = context.path;
+        });
+        errors.push(...subSchemaErrors);
+      });
+      errors = removeDuplicatesFromArray(errors);
+    }
   }
   return errors;
 }
@@ -546,23 +578,46 @@ function anyOf(context) {
   const errors = [];
   const anyOf2 = getSchemaAnyOf(context.schema);
   if (isSet(anyOf2)) {
+    const enableSubErrors = getSchemaXOption(context.schema, "subErrors") ?? context.validator.subErrors;
     let valid = false;
-    for (const schema of anyOf2) {
-      const anyOfErrors = context.validator.getErrors(context.value, schema, context.key, context.path);
-      if (anyOfErrors.length === 0) {
-        valid = true;
-        break;
-      }
-    }
-    if (!valid) {
-      errors.push({
-        type: "error",
-        path: context.path,
-        constraint: "anyOf",
-        messages: [
-          context.translator.translate("errorAnyOf")
-        ]
+    if (enableSubErrors) {
+      const schemaResults = [];
+      anyOf2.forEach((schema, index2) => {
+        const anyOfErrors = context.validator.getErrors(context.value, schema, context.key, context.path);
+        if (anyOfErrors.length === 0) {
+          valid = true;
+        }
+        schemaResults.push({ schemaIndex: index2, errors: anyOfErrors });
       });
+      if (!valid) {
+        errors.push({
+          type: "error",
+          path: context.path,
+          constraint: "anyOf",
+          messages: [
+            context.translator.translate("errorAnyOf")
+          ],
+          subErrors: schemaResults.filter((r) => r.errors.length > 0)
+        });
+      }
+    } else {
+      for (const schema of anyOf2) {
+        const anyOfErrors = context.validator.getErrors(context.value, schema, context.key, context.path);
+        if (anyOfErrors.length === 0) {
+          valid = true;
+          break;
+        }
+      }
+      if (!valid) {
+        errors.push({
+          type: "error",
+          path: context.path,
+          constraint: "anyOf",
+          messages: [
+            context.translator.translate("errorAnyOf")
+          ]
+        });
+      }
     }
   }
   return errors;
@@ -630,10 +685,8 @@ function exclusiveMinimum(context) {
 function format(context) {
   const errors = [];
   const format2 = getSchemaFormat(context.schema);
-  let assertFormat = context.validator.assertFormat;
-  if (getSchemaXOption(context.schema, "assertFormat")) {
-    assertFormat = context.schema.options.assertFormat;
-  }
+  const xAssertFormat = getSchemaXOption(context.schema, "assertFormat");
+  const assertFormat = xAssertFormat !== void 0 ? xAssertFormat : context.validator.assertFormat;
   if (isSet(format2) && isString(context.value) && assertFormat) {
     let regexp;
     if (format2 === "email") {
@@ -673,18 +726,23 @@ function items(context) {
         messages: [context.translator.translate("errorItems")]
       });
     } else if (isObject(items2)) {
+      const enableSubErrors = getSchemaXOption(context.schema, "subErrors") ?? context.validator.subErrors;
       context.value.slice(prefixItemsSchemasCount).forEach((itemValue, i) => {
         const index2 = prefixItemsSchemasCount + i;
         const tmpErrors = context.validator.getErrors(itemValue, items2, index2, context.path + "/" + index2);
         if (tmpErrors.length > 0) {
-          errors.push({
+          const error = {
             type: "error",
             path: context.path,
             constraint: "items",
             messages: [
               compileTemplate(context.translator.translate("errorItems"), { index: index2 })
             ]
-          });
+          };
+          if (enableSubErrors) {
+            error.subErrors = tmpErrors;
+          }
+          errors.push(error);
         }
       });
     }
@@ -862,23 +920,64 @@ function oneOf(context) {
   const oneOf2 = getSchemaOneOf(context.schema);
   if (isSet(oneOf2)) {
     let counter = 0;
-    oneOf2.forEach((schema) => {
-      const oneOfErrors = context.validator.getErrors(context.value, schema, context.key, context.path);
-      if (oneOfErrors.length === 0) {
-        counter++;
+    const enableSubErrors = getSchemaXOption(context.schema, "subErrors") ?? context.validator.subErrors;
+    if (enableSubErrors) {
+      const schemaResults = [];
+      oneOf2.forEach((schema, index2) => {
+        const oneOfErrors = context.validator.getErrors(context.value, schema, context.key, context.path);
+        if (oneOfErrors.length === 0) {
+          counter++;
+          schemaResults.push({ schemaIndex: index2, matched: true, errors: [] });
+        } else {
+          schemaResults.push({ schemaIndex: index2, matched: false, errors: oneOfErrors });
+        }
+      });
+      if (counter !== 1) {
+        const error = {
+          type: "error",
+          path: context.path,
+          constraint: "oneOf",
+          messages: [
+            compileTemplate(context.translator.translate("errorOneOf"), {
+              counter
+            })
+          ]
+        };
+        if (counter === 0) {
+          error.subErrors = schemaResults.filter((r) => !r.matched).map((r) => ({
+            schemaIndex: r.schemaIndex,
+            errors: r.errors
+          }));
+        } else {
+          error.matchingSchemas = schemaResults.filter((r) => r.matched).map((r) => r.schemaIndex);
+        }
+        errors.push(error);
       }
-    });
-    if (counter !== 1) {
-      errors.push({
-        type: "error",
-        path: context.path,
-        constraint: "oneOf",
-        messages: [
-          compileTemplate(context.translator.translate("errorOneOf"), {
-            counter
-          })
-        ]
+    } else {
+      const matchingSchemas = [];
+      oneOf2.forEach((schema, index2) => {
+        const oneOfErrors = context.validator.getErrors(context.value, schema, context.key, context.path);
+        if (oneOfErrors.length === 0) {
+          counter++;
+          matchingSchemas.push(index2);
+        }
       });
+      if (counter !== 1) {
+        const error = {
+          type: "error",
+          path: context.path,
+          constraint: "oneOf",
+          messages: [
+            compileTemplate(context.translator.translate("errorOneOf"), {
+              counter
+            })
+          ]
+        };
+        if (counter > 0) {
+          error.matchingSchemas = matchingSchemas;
+        }
+        errors.push(error);
+      }
     }
   }
   return errors;
@@ -931,6 +1030,8 @@ function patternProperties(context) {
 function properties(context) {
   const schemaProperties = getSchemaProperties(context.schema);
   const invalidProperties = [];
+  const enableSubErrors = getSchemaXOption(context.schema, "subErrors") ?? context.validator.subErrors;
+  const propertySubErrors = [];
   if (isObject(context.value) && isSet(schemaProperties)) {
     Object.keys(schemaProperties).forEach((propertyName) => {
       if (hasOwn(context.value, propertyName)) {
@@ -943,19 +1044,26 @@ function properties(context) {
         );
         if (propertyErrors.length > 0) {
           invalidProperties.push(propertyName);
+          if (enableSubErrors) {
+            propertySubErrors.push({ property: propertyName, errors: propertyErrors });
+          }
         }
       }
     });
   }
   if (invalidProperties.length > 0) {
-    return [{
+    const error = {
       type: "error",
       path: context.path,
       constraint: "properties",
       messages: [
         compileTemplate(context.translator.translate("errorProperties"), { properties: invalidProperties.join(", ") })
       ]
-    }];
+    };
+    if (enableSubErrors) {
+      error.subErrors = propertySubErrors;
+    }
+    return [error];
   }
   return [];
 }
@@ -1232,9 +1340,11 @@ function dependentRequired(context) {
     Object.keys(dependentRequired2).forEach((key) => {
       if (isSet(context.value[key])) {
         const requiredProperties = dependentRequired2[key];
-        missingProperties = requiredProperties.filter((property) => {
-          return !hasOwn(context.value, property);
-        });
+        if (isArray(requiredProperties)) {
+          missingProperties = requiredProperties.filter((property) => {
+            return !hasOwn(context.value, property);
+          });
+        }
       }
     });
     const invalid = missingProperties.length > 0;
@@ -1293,12 +1403,13 @@ function prefixItems(context) {
   const errors = [];
   const prefixItems2 = getSchemaPrefixItems(context.schema);
   if (isArray(context.value) && isSet(prefixItems2)) {
+    const enableSubErrors = getSchemaXOption(context.schema, "subErrors") ?? context.validator.subErrors;
     prefixItems2.forEach((itemSchema, index2) => {
       const itemValue = context.value[index2];
       if (isSet(itemValue)) {
         const tmpErrors = context.validator.getErrors(itemValue, itemSchema, index2, context.path + "/" + index2);
         if (tmpErrors.length > 0) {
-          errors.push({
+          const error = {
             type: "error",
             path: context.path,
             constraint: "prefixItems",
@@ -1307,7 +1418,11 @@ function prefixItems(context) {
                 index: index2
               })
             ]
-          });
+          };
+          if (enableSubErrors) {
+            error.subErrors = tmpErrors;
+          }
+          errors.push(error);
         }
       }
     });
@@ -1538,6 +1653,7 @@ class Validator {
     this.constraints = config.constraints ?? {};
     this.assertFormat = config.assertFormat ? config.assertFormat : false;
     this.translator = config.translator ? config.translator : false;
+    this.subErrors = config.subErrors ?? false;
     this.draft = draft202012;
     this.jsonSchemaDrafts = {
       "http://json-schema.org/draft-04/schema#": draft04,
@@ -2123,11 +2239,13 @@ class Editor {
     });
     this.control.messages.innerHTML = "";
     this.showingValidationErrors = false;
+    this.setAriaInvalid(false);
     const neverShowErrors = this.instance.jedison.options.showErrors === "never" || getSchemaXOption(this.instance.schema, "showErrors") === "never";
     if (neverShowErrors && !force || errors.length === 0) {
       return;
     }
     const muteValidationMessages = getSchemaXOption(this.instance.schema, "muteValidationMessages") ?? this.instance.jedison.options.muteValidationMessages ?? [];
+    let hasErrors = false;
     errors.forEach((error) => {
       if (muteValidationMessages.includes(error.constraint)) {
         return;
@@ -2135,6 +2253,7 @@ class Editor {
       error.messages.forEach((message) => {
         let invalidFeedback;
         if (error.type === "error") {
+          hasErrors = true;
           invalidFeedback = this.getErrorFeedback({
             message
           });
@@ -2146,8 +2265,20 @@ class Editor {
         this.control.messages.appendChild(invalidFeedback);
       });
     });
+    if (hasErrors) {
+      this.setAriaInvalid(true);
+    }
     this.showingValidationErrors = true;
   }
+  setAriaInvalid(invalid) {
+    if (this.control.input) {
+      if (invalid) {
+        this.control.input.setAttribute("aria-invalid", "true");
+      } else {
+        this.control.input.removeAttribute("aria-invalid");
+      }
+    }
+  }
   /**
    * Get an error message container
    */
@@ -2234,6 +2365,8 @@ class Editor {
     }
     return schemaInfo;
   }
+  refreshLegendWarning() {
+  }
   /**
    * Updates control UI when its state changes
    */
@@ -2635,6 +2768,21 @@ class InstanceMultiple extends Instance {
    * Returns the index of the instance that has less validation errors
    */
   getFittestIndex(value) {
+    const discriminator = getSchemaXOption(this.schema, "discriminator");
+    if (isSet(discriminator) && isObject(value)) {
+      const propName = isString(discriminator) ? discriminator : discriminator.propertyName;
+      const discriminatorValue = value[propName];
+      if (isSet(discriminatorValue)) {
+        for (let index2 = 0; index2 < this.schemas.length; index2++) {
+          const schema = this.schemas[index2];
+          const propSchema = schema.properties && schema.properties[propName];
+          if (propSchema) {
+            const propErrors = this.jedison.validator.getErrors(discriminatorValue, propSchema, propName, this.path);
+            if (propErrors.length === 0) return index2;
+          }
+        }
+      }
+    }
     let fittestIndex;
     let championErrors;
     for (let index2 = 0; index2 < this.instances.length; index2++) {
@@ -2761,9 +2909,11 @@ class InstanceObject extends Instance {
       Object.keys(dependentRequired2).forEach((key) => {
         if (isSet(this.value[key])) {
           const requiredProperties = dependentRequired2[key];
-          missingProperties = requiredProperties.filter((property2) => {
-            return !hasOwn(this.value, property2);
-          });
+          if (isArray(requiredProperties)) {
+            missingProperties = requiredProperties.filter((property2) => {
+              return !hasOwn(this.value, property2);
+            });
+          }
         }
       });
       return missingProperties.includes(property);
@@ -3149,6 +3299,15 @@ class EditorRadios extends EditorBoolean {
       radio.checked = radioValue === this.instance.getValue();
     });
   }
+  setAriaInvalid(invalid) {
+    this.control.radios.forEach((radio) => {
+      if (invalid) {
+        radio.setAttribute("aria-invalid", "true");
+      } else {
+        radio.removeAttribute("aria-invalid");
+      }
+    });
+  }
 }
 class EditorBooleanSelect extends EditorBoolean {
   static resolves(schema) {
@@ -3218,18 +3377,86 @@ class EditorStringRadios extends EditorString {
   static resolves(schema) {
     return getSchemaType(schema) === "string" && (getSchemaXOption(schema, "format") === "radios" || getSchemaXOption(schema, "format") === "radios-inline");
   }
+  init() {
+    super.init();
+    this.setupEnumSource();
+  }
+  setupEnumSource() {
+    const enumSourceRaw = getSchemaXOption(this.instance.schema, "enumSource");
+    if (!isSet(enumSourceRaw)) return;
+    const enumSource = resolveInstancePath(this.instance.path, enumSourceRaw);
+    const src = this.instance.jedison.getInstance(enumSource);
+    if (src) this.enumSourceValues = src.getValue();
+    this.instance.jedison.watch(enumSource, () => {
+      if (!this.control) return;
+      const s = this.instance.jedison.getInstance(enumSource);
+      if (s) {
+        this.enumSourceValues = s.getValue();
+        this.refreshOptions();
+      }
+    });
+  }
+  getEnumSourceValues() {
+    if (this.enumSourceValues !== void 0) {
+      if (isArray(this.enumSourceValues)) return this.enumSourceValues;
+      if (isObject(this.enumSourceValues)) return Object.keys(this.enumSourceValues);
+      return [];
+    }
+    return getSchemaEnum(this.instance.schema) || [];
+  }
   build() {
+    const values = this.getEnumSourceValues();
     this.control = this.theme.getRadiosControl({
       title: this.getTitle(),
       description: this.getDescription(),
-      values: getSchemaEnum(this.instance.schema),
-      titles: getSchemaXOption(this.instance.schema, "enumTitles") || getSchemaEnum(this.instance.schema),
+      values,
+      titles: getSchemaXOption(this.instance.schema, "enumTitles") || values,
       id: this.getIdFromPath(this.instance.path),
       titleHidden: getSchemaXOption(this.instance.schema, "titleHidden"),
       inline: getSchemaXOption(this.instance.schema, "format") === "radios-inline",
       info: this.getInfo()
     });
   }
+  refreshOptions() {
+    const values = this.getEnumSourceValues();
+    const titles = getSchemaXOption(this.instance.schema, "enumTitles") || values;
+    const id = this.getIdFromPath(this.instance.path);
+    const messagesId = id + "-messages";
+    const descriptionId = id + "-description";
+    const describedBy = messagesId + " " + descriptionId;
+    this.control.radioControls.forEach((rc) => {
+      if (rc.parentNode) rc.parentNode.removeChild(rc);
+    });
+    this.control.radios = [];
+    this.control.labels = [];
+    this.control.radioControls = [];
+    this.control.labelTexts = [];
+    values.forEach((value, index2) => {
+      const radioControl = document.createElement("div");
+      const radio = document.createElement("input");
+      const label = document.createElement("label");
+      const labelText = document.createElement("span");
+      radio.setAttribute("type", "radio");
+      radio.setAttribute("id", id + "-" + index2);
+      radio.setAttribute("name", id);
+      radio.setAttribute("value", value);
+      radio.setAttribute("aria-describedby", describedBy);
+      label.setAttribute("for", id + "-" + index2);
+      label.classList.add("jedi-title");
+      label.classList.add("jedi-label");
+      labelText.textContent = titles && titles[index2] !== void 0 ? titles[index2] : value;
+      radioControl.appendChild(radio);
+      radioControl.appendChild(label);
+      label.appendChild(labelText);
+      this.control.radios.push(radio);
+      this.control.labels.push(label);
+      this.control.labelTexts.push(labelText);
+      this.control.radioControls.push(radioControl);
+      this.control.fieldset.insertBefore(radioControl, this.control.description);
+    });
+    this.addEventListeners();
+    this.refreshUI();
+  }
   adaptForTable() {
     this.theme.adaptForTableRadiosControl(this.control);
   }
@@ -3246,23 +3473,73 @@ class EditorStringRadios extends EditorString {
       radio.checked = radio.value === this.instance.getValue();
     });
   }
+  setAriaInvalid(invalid) {
+    this.control.radios.forEach((radio) => {
+      if (invalid) {
+        radio.setAttribute("aria-invalid", "true");
+      } else {
+        radio.removeAttribute("aria-invalid");
+      }
+    });
+  }
 }
 class EditorStringSelect extends EditorString {
   static resolves(schema) {
-    return getSchemaType(schema) === "string" && isSet(getSchemaEnum(schema));
+    return getSchemaType(schema) === "string" && (isSet(getSchemaEnum(schema)) || isSet(getSchemaXOption(schema, "enumSource")));
+  }
+  init() {
+    super.init();
+    this.setupEnumSource();
+  }
+  setupEnumSource() {
+    const enumSourceRaw = getSchemaXOption(this.instance.schema, "enumSource");
+    if (!isSet(enumSourceRaw)) return;
+    const enumSource = resolveInstancePath(this.instance.path, enumSourceRaw);
+    const src = this.instance.jedison.getInstance(enumSource);
+    if (src) this.enumSourceValues = src.getValue();
+    this.instance.jedison.watch(enumSource, () => {
+      if (!this.control) return;
+      const s = this.instance.jedison.getInstance(enumSource);
+      if (s) {
+        this.enumSourceValues = s.getValue();
+        this.refreshOptions();
+      }
+    });
+  }
+  getEnumSourceValues() {
+    if (this.enumSourceValues !== void 0) {
+      if (isArray(this.enumSourceValues)) return this.enumSourceValues;
+      if (isObject(this.enumSourceValues)) return Object.keys(this.enumSourceValues);
+      return [];
+    }
+    return getSchemaEnum(this.instance.schema) || [];
   }
   build() {
+    const values = this.getEnumSourceValues();
     this.control = this.theme.getSelectControl({
       title: this.getTitle(),
       description: this.getDescription(),
-      values: getSchemaEnum(this.instance.schema),
-      titles: getSchemaXOption(this.instance.schema, "enumTitles") || getSchemaEnum(this.instance.schema),
+      values,
+      titles: getSchemaXOption(this.instance.schema, "enumTitles") || values,
       id: this.getIdFromPath(this.instance.path),
       titleIconClass: getSchemaXOption(this.instance.schema, "titleIconClass"),
       titleHidden: getSchemaXOption(this.instance.schema, "titleHidden"),
       info: this.getInfo()
     });
   }
+  refreshOptions() {
+    const values = this.getEnumSourceValues();
+    const titles = getSchemaXOption(this.instance.schema, "enumTitles") || values;
+    const select = this.control.input;
+    select.innerHTML = "";
+    values.forEach((value, i) => {
+      const option = document.createElement("option");
+      option.setAttribute("value", value);
+      option.textContent = titles && titles[i] !== void 0 ? titles[i] : value;
+      select.appendChild(option);
+    });
+    this.refreshUI();
+  }
   adaptForTable() {
     this.theme.adaptForTableSelectControl(this.control);
   }
@@ -3504,25 +3781,75 @@ class EditorNumberRadios extends EditorNumber {
       radio.checked = Number(radio.value) === Number(this.instance.getValue());
     });
   }
+  setAriaInvalid(invalid) {
+    this.control.radios.forEach((radio) => {
+      if (invalid) {
+        radio.setAttribute("aria-invalid", "true");
+      } else {
+        radio.removeAttribute("aria-invalid");
+      }
+    });
+  }
 }
 class EditorNumberSelect extends EditorNumber {
   static resolves(schema) {
     const schemaType = getSchemaType(schema);
     const typeIsNumeric = schemaType === "number" || schemaType === "integer";
-    return typeIsNumeric && isSet(getSchemaEnum(schema));
+    return typeIsNumeric && (isSet(getSchemaEnum(schema)) || isSet(getSchemaXOption(schema, "enumSource")));
+  }
+  init() {
+    super.init();
+    this.setupEnumSource();
+  }
+  setupEnumSource() {
+    const enumSourceRaw = getSchemaXOption(this.instance.schema, "enumSource");
+    if (!isSet(enumSourceRaw)) return;
+    const enumSource = resolveInstancePath(this.instance.path, enumSourceRaw);
+    const src = this.instance.jedison.getInstance(enumSource);
+    if (src) this.enumSourceValues = src.getValue();
+    this.instance.jedison.watch(enumSource, () => {
+      if (!this.control) return;
+      const s = this.instance.jedison.getInstance(enumSource);
+      if (s) {
+        this.enumSourceValues = s.getValue();
+        this.refreshOptions();
+      }
+    });
+  }
+  getEnumSourceValues() {
+    if (this.enumSourceValues !== void 0) {
+      if (isArray(this.enumSourceValues)) return this.enumSourceValues;
+      if (isObject(this.enumSourceValues)) return Object.keys(this.enumSourceValues);
+      return [];
+    }
+    return getSchemaEnum(this.instance.schema) || [];
   }
   build() {
+    const values = this.getEnumSourceValues();
     this.control = this.theme.getSelectControl({
       title: this.getTitle(),
       description: this.getDescription(),
-      values: getSchemaEnum(this.instance.schema),
-      titles: getSchemaXOption(this.instance.schema, "enumTitles") || getSchemaEnum(this.instance.schema),
+      values,
+      titles: getSchemaXOption(this.instance.schema, "enumTitles") || values,
       id: this.getIdFromPath(this.instance.path),
       titleIconClass: getSchemaXOption(this.instance.schema, "titleIconClass"),
       titleHidden: getSchemaXOption(this.instance.schema, "titleHidden"),
       info: this.getInfo()
     });
   }
+  refreshOptions() {
+    const values = this.getEnumSourceValues();
+    const titles = getSchemaXOption(this.instance.schema, "enumTitles") || values;
+    const select = this.control.input;
+    select.innerHTML = "";
+    values.forEach((value, i) => {
+      const option = document.createElement("option");
+      option.setAttribute("value", value);
+      option.textContent = titles && titles[i] !== void 0 ? titles[i] : value;
+      select.appendChild(option);
+    });
+    this.refreshUI();
+  }
   adaptForTable() {
     this.theme.adaptForTableSelectControl(this.control);
   }
@@ -3645,6 +3972,10 @@ class EditorObject extends Editor {
     if (isSet(additionalProperties2) && additionalProperties2 === false) {
       addProperty = false;
     }
+    const objectAdd = getSchemaXOption(this.instance.schema, "objectAdd") ?? this.instance.jedison.options.objectAdd;
+    if (isSet(objectAdd) && objectAdd === false) {
+      addProperty = false;
+    }
     let enablePropertiesToggle = false;
     if (isSet(this.instance.jedison.options.enablePropertiesToggle)) {
       enablePropertiesToggle = this.instance.jedison.options.enablePropertiesToggle;
@@ -3671,30 +4002,30 @@ class EditorObject extends Editor {
     });
     this.control.jsonData.input.value = JSON.stringify(this.instance.getValue(), null, 2);
   }
+  announcePropertyAdded(propertyName, child) {
+    const schemaTitle = getSchemaTitle(child.schema);
+    const label = isSet(schemaTitle) ? schemaTitle : propertyName;
+    const ariaLiveMessage = this.theme.getAriaLiveMessage();
+    ariaLiveMessage.textContent = label + " " + this.instance.jedison.translator.translate("objectPropertyAdded");
+    this.control.ariaLive.appendChild(ariaLiveMessage);
+  }
+  addProperty(input, postAction) {
+    const propertyName = input.value.split(" ").join("");
+    if (propertyName.length === 0) return;
+    if (isSet(this.instance.value[propertyName])) return;
+    const schema = this.instance.getPropertySchema(propertyName);
+    const child = this.instance.createChild(schema, propertyName);
+    child.activate();
+    this.instance.setValue(this.instance.value, true, "user");
+    input.value = "";
+    this.announcePropertyAdded(propertyName, child);
+    postAction();
+  }
   addEventListeners() {
-    this.control.addPropertyBtn.addEventListener("click", () => {
-      const propertyName = this.control.addPropertyControl.input.value.split(" ").join("");
-      const propertyNameEmpty = propertyName.length === 0;
-      if (propertyNameEmpty) {
-        return;
-      }
-      const propertyExist = isSet(this.instance.value[propertyName]);
-      if (propertyExist) {
-        return;
-      }
-      const schema = this.instance.getPropertySchema(propertyName);
-      const child = this.instance.createChild(schema, propertyName);
-      child.activate();
-      this.instance.setValue(this.instance.value, true, "user");
-      this.control.addPropertyControl.input.value = "";
-      const ariaLive = this.control.ariaLive;
-      const schemaTitle = getSchemaTitle(child.schema);
-      const label = isSet(schemaTitle) ? schemaTitle : propertyName;
-      const ariaLiveMessage = this.theme.getAriaLiveMessage();
-      ariaLiveMessage.textContent = label + " " + this.instance.jedison.translator.translate("objectPropertyAdded");
-      ariaLive.appendChild(ariaLiveMessage);
-      this.control.propertiesContainer.close();
-      this.control.propertiesContainer.showModal();
+    this.control.quickAddPropertyBtn.addEventListener("click", () => {
+      this.addProperty(this.control.quickAddPropertyControl.input, () => {
+        this.control.quickAddPropertyContainer.close();
+      });
     });
     this.control.jsonData.saveBtn.addEventListener("click", () => {
       try {
@@ -3724,9 +4055,7 @@ class EditorObject extends Editor {
       const declaredProperties = Object.keys(this.instance.properties);
       const instanceProperties = this.instance.children.map((child) => child.getKey());
       const properties2 = [.../* @__PURE__ */ new Set([...declaredProperties, ...instanceProperties])];
-      while (this.control.propertiesActivators.firstChild) {
-        this.control.propertiesActivators.removeChild(this.control.propertiesActivators.firstChild);
-      }
+      this.control.propertiesActivators.replaceChildren();
       const {
         container: defaultGroupContainer,
         group: defaultGroup
@@ -3783,12 +4112,28 @@ class EditorObject extends Editor {
         checkbox.disabled = this.disabled || isRequired;
         checkbox.checked = hasOwn(currentValue, property);
       });
+      const propGroupOrder = getSchemaXOption(this.instance.schema, "propGroupOrder");
+      if (isSet(propGroupOrder) && Array.isArray(propGroupOrder)) {
+        const orderedContainers = [defaultGroupContainer];
+        propGroupOrder.forEach((groupName) => {
+          if (isSet(propertiesGroups[groupName])) {
+            orderedContainers.push(propertiesGroups[groupName].container);
+          }
+        });
+        Object.keys(propertiesGroups).forEach((groupName) => {
+          if (!propGroupOrder.includes(groupName)) {
+            orderedContainers.push(propertiesGroups[groupName].container);
+          }
+        });
+        this.control.propertiesActivators.replaceChildren();
+        orderedContainers.forEach((container) => {
+          this.control.propertiesActivators.appendChild(container);
+        });
+      }
     }
   }
   refreshEditors() {
-    while (this.control.childrenSlot.firstChild) {
-      this.control.childrenSlot.removeChild(this.control.childrenSlot.firstChild);
-    }
+    this.control.childrenSlot.replaceChildren();
     this.instance.children.forEach((child) => {
       const optIn = this.theme.getCheckboxControl({
         id: child.path + "-opt-in",
@@ -3822,11 +4167,32 @@ class EditorObject extends Editor {
       }
     });
   }
+  refreshLegendWarning() {
+    if (!this.control.legendText) return;
+    const navWarning = getSchemaXOption(this.instance.schema, "navWarning") ?? true;
+    const hasErrors = navWarning && this.instance.hasNestedValidationErrors();
+    const existing = this.control.legendText.querySelector(".jedi-legend-warning");
+    if (existing) existing.parentNode.removeChild(existing);
+    if (hasErrors) {
+      const warning = document.createElement("span");
+      warning.classList.add("jedi-legend-warning");
+      warning.textContent = "⚠";
+      const navWarningMessage = getSchemaXOption(this.instance.schema, "navWarningMessage");
+      if (navWarningMessage) warning.setAttribute("title", navWarningMessage);
+      this.theme.styleLegendWarning(warning);
+      this.control.legendText.appendChild(warning);
+    }
+  }
+  showValidationErrors(errors, force = false) {
+    super.showValidationErrors(errors, force);
+    this.refreshLegendWarning();
+  }
   refreshUI() {
     super.refreshUI();
     this.refreshPropertiesSlot();
     this.refreshEditors();
     this.refreshJsonData();
+    this.refreshLegendWarning();
   }
 }
 class EditorObjectGrid extends EditorObject {
@@ -3904,6 +4270,8 @@ class EditorObjectCategories extends EditorObject {
     const categoriesMap = /* @__PURE__ */ new Map();
     this.instance.children.forEach((child) => {
       if (!child.isActive) return;
+      const hidden = getSchemaXOption(child.schema, "hidden");
+      if (isSet(hidden) && hidden === true) return;
       const childSchemaType = getSchemaType(child.schema);
       const xCategory = getSchemaXOption(child.schema, "category");
       let categoryName;
@@ -3963,6 +4331,22 @@ class EditorObjectNav extends EditorObject {
     super.init();
     this.activeTabIndex = 0;
   }
+  isChildVisible(child) {
+    if (!child.isActive) return false;
+    const hidden = getSchemaXOption(child.schema, "hidden");
+    return !(isSet(hidden) && hidden === true);
+  }
+  getVisibleChildIndices() {
+    return this.instance.children.reduce((indices, child, index2) => {
+      if (this.isChildVisible(child)) indices.push(index2);
+      return indices;
+    }, []);
+  }
+  ensureActiveTabIsVisible(visibleIndices) {
+    if (!visibleIndices.includes(this.activeTabIndex)) {
+      this.activeTabIndex = visibleIndices[0] ?? 0;
+    }
+  }
   refreshEditors() {
     while (this.control.childrenSlot.firstChild) {
       this.control.childrenSlot.removeChild(this.control.childrenSlot.lastChild);
@@ -3984,31 +4368,32 @@ class EditorObjectNav extends EditorObject {
     row.appendChild(tabContentCol);
     tabListCol.appendChild(tabList);
     tabContentCol.appendChild(tabContent);
+    const visibleIndices = this.getVisibleChildIndices();
+    this.ensureActiveTabIsVisible(visibleIndices);
     this.instance.children.forEach((child, index2) => {
-      if (child.isActive) {
-        const active = index2 === this.activeTabIndex;
-        const id = pathToAttribute(child.path);
-        const schemaTitle = getSchemaTitle(child.schema);
-        const navWarning = getSchemaXOption(this.instance.schema, "navWarning") ?? true;
-        const navWarningMessage = getSchemaXOption(this.instance.schema, "navWarningMessage");
-        const tab = this.theme.getTab({
-          hasErrors: navWarning && child.hasNestedValidationErrors(),
-          navWarningMessage,
-          title: isSet(schemaTitle) ? schemaTitle : child.getKey(),
-          id,
-          active
-        });
-        tab.list.addEventListener("click", () => {
-          this.activeTabIndex = index2;
-        });
-        this.theme.setTabPaneAttributes(child.ui.control.container, active, id);
-        tabList.appendChild(tab.list);
-        tabContent.appendChild(child.ui.control.container);
-        if (this.disabled || this.instance.isReadOnly()) {
-          child.ui.disable();
-        } else {
-          child.ui.enable();
-        }
+      if (!this.isChildVisible(child)) return;
+      const active = index2 === this.activeTabIndex;
+      const id = pathToAttribute(child.path);
+      const schemaTitle = getSchemaTitle(child.schema);
+      const navWarning = getSchemaXOption(this.instance.schema, "navWarning") ?? true;
+      const navWarningMessage = getSchemaXOption(this.instance.schema, "navWarningMessage");
+      const tab = this.theme.getTab({
+        hasErrors: navWarning && child.hasNestedValidationErrors(),
+        navWarningMessage,
+        title: isSet(schemaTitle) ? schemaTitle : child.getKey(),
+        id,
+        active
+      });
+      tab.list.addEventListener("click", () => {
+        this.activeTabIndex = index2;
+      });
+      this.theme.setTabPaneAttributes(child.ui.control.container, active, id);
+      tabList.appendChild(tab.list);
+      tabContent.appendChild(child.ui.control.container);
+      if (this.disabled || this.instance.isReadOnly()) {
+        child.ui.disable();
+      } else {
+        child.ui.enable();
       }
     });
   }
@@ -4086,10 +4471,19 @@ class EditorArray extends Editor {
     });
     const btnGroup = this.theme.getBtnGroup();
     deleteBtn.addEventListener("click", () => {
-      const confirmDeletion = window.confirm(this.instance.jedison.translator.translate("arrayConfirmDelete"));
-      if (confirmDeletion) {
+      const schemaConfirm = getSchemaXOption(this.instance.schema, "arrayDeleteConfirm");
+      const globalConfirm = this.instance.jedison.options.arrayDeleteConfirm;
+      const shouldConfirm = isSet(schemaConfirm) ? schemaConfirm : globalConfirm;
+      const doDelete = () => {
         this.activeItemIndex = clamp(index2 - 1, 0, this.instance.value.length - 1);
         this.instance.deleteItem(index2, "user");
+      };
+      if (shouldConfirm) {
+        if (window.confirm(this.instance.jedison.translator.translate("arrayConfirmDelete"))) {
+          doDelete();
+        }
+      } else {
+        doDelete();
       }
     });
     moveUpBtn.addEventListener("click", () => {
@@ -4182,6 +4576,27 @@ class EditorArray extends Editor {
     });
     this.refreshAddBtn();
     this.refreshJsonData();
+    this.refreshLegendWarning();
+  }
+  refreshLegendWarning() {
+    if (!this.control.legendText) return;
+    const navWarning = getSchemaXOption(this.instance.schema, "navWarning") ?? true;
+    const hasErrors = navWarning && this.instance.hasNestedValidationErrors();
+    const existing = this.control.legendText.querySelector(".jedi-legend-warning");
+    if (existing) existing.parentNode.removeChild(existing);
+    if (hasErrors) {
+      const warning = document.createElement("span");
+      warning.classList.add("jedi-legend-warning");
+      warning.textContent = "⚠";
+      const navWarningMessage = getSchemaXOption(this.instance.schema, "navWarningMessage");
+      if (navWarningMessage) warning.setAttribute("title", navWarningMessage);
+      this.theme.styleLegendWarning(warning);
+      this.control.legendText.appendChild(warning);
+    }
+  }
+  showValidationErrors(errors, force = false) {
+    super.showValidationErrors(errors, force);
+    this.refreshLegendWarning();
   }
 }
 class EditorArrayTuple extends EditorArray {
@@ -4256,20 +4671,22 @@ class EditorArrayTable extends EditorArray {
     if (this.instance.children.length) {
       const schemaItems = getSchemaItems(this.instance.schema);
       const thTitle = this.theme.getTableHeader();
-      if (schemaItems.title) {
-        const fakeLabel = this.theme.getFakeLabel({
-          content: schemaItems.title
-        });
-        thTitle.appendChild(fakeLabel.label);
-      }
-      const schemaXInfo = getSchemaXOption(schemaItems, "info");
-      if (isSet(schemaXInfo)) {
-        const infoContent = this.getInfo(schemaItems);
-        const info = this.theme.getInfo(infoContent);
-        if (schemaXInfo.variant === "modal") {
-          this.theme.infoAsModal(info, this.getIdFromPath(this.instance.path), infoContent);
+      if (schemaItems) {
+        if (schemaItems.title) {
+          const fakeLabel = this.theme.getFakeLabel({
+            content: schemaItems.title
+          });
+          thTitle.appendChild(fakeLabel.label);
+        }
+        const schemaXInfo = getSchemaXOption(schemaItems, "info");
+        if (isSet(schemaXInfo)) {
+          const infoContent = this.getInfo(schemaItems);
+          const info = this.theme.getInfo(infoContent);
+          if (schemaXInfo.variant === "modal") {
+            this.theme.infoAsModal(info, this.getIdFromPath(this.instance.path), infoContent);
+          }
+          thTitle.appendChild(info.container);
         }
-        thTitle.appendChild(info.container);
       }
       table.thead.appendChild(thTitle);
     }
@@ -4489,6 +4906,45 @@ class EditorArrayChoices extends Editor {
     const hasValidItemType = isSet(schemaItems) && isSet(schemaItemsType) && (validTypes.includes(schemaItemsType) || isArray(schemaItemsType) && schemaItemsType.some((type2) => validTypes.includes(type2)));
     return hasChoicesFormat && choicesInstalled && isArrayType && isUniqueItems && hasTypes && hasValidItemType;
   }
+  init() {
+    super.init();
+    this.setupEnumSource();
+  }
+  setupEnumSource() {
+    const enumSourceRaw = getSchemaXOption(this.instance.schema, "enumSource");
+    if (!isSet(enumSourceRaw)) return;
+    const enumSource = resolveInstancePath(this.instance.path, enumSourceRaw);
+    const src = this.instance.jedison.getInstance(enumSource);
+    if (src) this.enumSourceValues = src.getValue();
+    this.instance.jedison.watch(enumSource, () => {
+      if (!this.control) return;
+      const s = this.instance.jedison.getInstance(enumSource);
+      if (s) {
+        this.enumSourceValues = s.getValue();
+        this.refreshOptions();
+      }
+    });
+  }
+  getEnumSourceValues() {
+    if (this.enumSourceValues !== void 0) {
+      if (isArray(this.enumSourceValues)) return this.enumSourceValues;
+      if (isObject(this.enumSourceValues)) return Object.keys(this.enumSourceValues);
+      return [];
+    }
+    return this.instance.schema.items && this.instance.schema.items.enum || [];
+  }
+  refreshOptions() {
+    if (!this.choicesInstance) return;
+    const values = this.getEnumSourceValues();
+    const currentValue = this.instance.getValue();
+    const itemEnumTitles = getSchemaXOption(this.instance.schema.items || {}, "enumTitles") || [];
+    const choices = values.map((item, index2) => ({
+      value: item,
+      label: itemEnumTitles[index2] || item,
+      selected: isArray(currentValue) && currentValue.includes(item)
+    }));
+    this.choicesInstance.setChoices(choices, "value", "label", true);
+  }
   build() {
     this.control = this.theme.getSelectControl({
       title: this.getTitle(),
@@ -4503,8 +4959,8 @@ class EditorArrayChoices extends Editor {
     this.control.input.setAttribute("multiple", "");
     try {
       const value = this.instance.getValue();
-      const itemEnum = this.instance.schema.items.enum ?? [];
-      const itemEnumTitles = getSchemaXOption(this.instance.schema.items, "enumTitles") ?? this.instance.getValue();
+      const itemEnum = this.getEnumSourceValues();
+      const itemEnumTitles = getSchemaXOption(this.instance.schema.items || {}, "enumTitles") || [];
       const choicesOptions = getSchemaXOption(this.instance.schema, "choicesOptions") ?? {};
       if (this.choicesInstance) {
         this.choicesInstance.destroy();
@@ -4659,6 +5115,7 @@ class EditorMultiple extends Editor {
   }
   build() {
     this.switcherInput = getSchemaXOption(this.instance.schema, "switcherInput") ?? this.instance.jedison.options.switcherInput;
+    this.embedSwitcher = getSchemaXOption(this.instance.schema, "embedSwitcher") ?? this.instance.jedison.options.embedSwitcher;
     this.control = this.theme.getMultipleControl({
       titleHidden: getSchemaXOption(this.instance.schema, "titleHidden"),
       id: this.getIdFromPath(this.instance.path),
@@ -4667,6 +5124,9 @@ class EditorMultiple extends Editor {
       switcher: this.switcherInput,
       readOnly: this.instance.isReadOnly()
     });
+    if (this.embedSwitcher) {
+      this.control.header.style.display = "none";
+    }
   }
   adaptForTable(td) {
     this.theme.adaptForTableMultipleControl(this.control, td);
@@ -4691,6 +5151,17 @@ class EditorMultiple extends Editor {
     this.refreshDisabledState();
     this.control.childrenSlot.innerHTML = "";
     this.control.childrenSlot.appendChild(this.instance.activeInstance.ui.control.container);
+    if (this.embedSwitcher) {
+      const slot = this.instance.activeInstance.ui.control.switcherSlot;
+      if (slot) {
+        slot.innerHTML = "";
+        slot.appendChild(this.control.switcher.container);
+        this.control.header.style.display = "none";
+      } else {
+        this.control.header.style.display = "";
+        this.control.header.appendChild(this.control.switcher.container);
+      }
+    }
     if (this.switcherInput === "select") {
       this.control.switcher.input.value = this.instance.index;
     }
@@ -5060,6 +5531,38 @@ class EditorNumberRaty extends EditorNumber {
     this.raty.score(this.instance.getValue());
   }
 }
+class EditorAnyJson extends Editor {
+  static resolves(schema) {
+    return getSchemaXOption(schema, "format") === "json";
+  }
+  build() {
+    this.control = this.theme.getTextareaControl({
+      title: this.getTitle(),
+      description: this.getDescription(),
+      id: this.getIdFromPath(this.instance.path),
+      titleIconClass: getSchemaXOption(this.instance.schema, "titleIconClass"),
+      titleHidden: getSchemaXOption(this.instance.schema, "titleHidden"),
+      info: this.getInfo()
+    });
+    this.jsonErrorEl = document.createElement("div");
+    this.jsonErrorEl.style.color = "red";
+    this.control.container.appendChild(this.jsonErrorEl);
+  }
+  addEventListeners() {
+    this.control.input.addEventListener("change", () => {
+      try {
+        const parsed = JSON.parse(this.control.input.value);
+        this.jsonErrorEl.textContent = "";
+        this.instance.setValue(parsed, true, "user");
+      } catch (e) {
+        this.jsonErrorEl.textContent = e.message;
+      }
+    });
+  }
+  refreshUI() {
+    this.control.input.value = JSON.stringify(this.instance.getValue(), null, 2);
+  }
+}
 class EditorArrayCheckboxes extends Editor {
   static resolves(schema) {
     const schemaType = getSchemaType(schema);
@@ -5069,22 +5572,93 @@ class EditorArrayCheckboxes extends Editor {
     const isUniqueItems = getSchemaUniqueItems(schema) === true;
     const hasEnum = isSet(schemaItems) && isSet(getSchemaEnum(schema.items));
     const hasTypes = isSet(schemaItems) && isSet(schemaItemsType);
+    const hasEnumSource = isSet(getSchemaXOption(schema, "enumSource"));
     const validTypes = ["string", "number", "integer"];
     const hasValidItemType = isSet(schemaItems) && isSet(schemaItemsType) && (validTypes.includes(schemaItemsType) || isArray(schemaItemsType) && schemaItemsType.some((type2) => validTypes.includes(type2)));
-    return isArrayType && isUniqueItems && hasEnum && hasTypes && hasValidItemType;
+    return isArrayType && isUniqueItems && (hasEnumSource || hasEnum && hasTypes && hasValidItemType);
+  }
+  init() {
+    super.init();
+    this.setupEnumSource();
+  }
+  setupEnumSource() {
+    const enumSourceRaw = getSchemaXOption(this.instance.schema, "enumSource");
+    if (!isSet(enumSourceRaw)) return;
+    const enumSource = resolveInstancePath(this.instance.path, enumSourceRaw);
+    const src = this.instance.jedison.getInstance(enumSource);
+    if (src) this.enumSourceValues = src.getValue();
+    this.instance.jedison.watch(enumSource, () => {
+      if (!this.control) return;
+      const s = this.instance.jedison.getInstance(enumSource);
+      if (s) {
+        this.enumSourceValues = s.getValue();
+        this.refreshOptions();
+      }
+    });
+  }
+  getEnumSourceValues() {
+    if (this.enumSourceValues !== void 0) {
+      if (isArray(this.enumSourceValues)) return this.enumSourceValues;
+      if (isObject(this.enumSourceValues)) return Object.keys(this.enumSourceValues);
+      return [];
+    }
+    return getSchemaEnum(this.instance.schema.items) || [];
   }
   build() {
+    const values = this.getEnumSourceValues();
+    const schemaItems = this.instance.schema.items || {};
+    const titles = getSchemaXOption(schemaItems, "enumTitles") || values;
     this.control = this.theme.getCheckboxesControl({
       title: this.getTitle(),
       description: this.getDescription(),
-      values: getSchemaEnum(this.instance.schema.items),
-      titles: getSchemaXOption(this.instance.schema.items, "enumTitles") || getSchemaEnum(this.instance.schema.items),
+      values,
+      titles,
       id: this.getIdFromPath(this.instance.path),
       titleHidden: getSchemaXOption(this.instance.schema, "titleHidden"),
       inline: getSchemaXOption(this.instance.schema, "format") === "checkboxes-inline",
       info: this.getInfo()
     });
   }
+  refreshOptions() {
+    const values = this.getEnumSourceValues();
+    const schemaItems = this.instance.schema.items || {};
+    const titles = getSchemaXOption(schemaItems, "enumTitles") || values;
+    const id = this.getIdFromPath(this.instance.path);
+    const messagesId = id + "-messages";
+    const descriptionId = id + "-description";
+    const describedBy = messagesId + " " + descriptionId;
+    this.control.checkboxControls.forEach((cc) => {
+      if (cc.parentNode) cc.parentNode.removeChild(cc);
+    });
+    this.control.checkboxes = [];
+    this.control.labels = [];
+    this.control.checkboxControls = [];
+    this.control.labelTexts = [];
+    values.forEach((value, index2) => {
+      const checkboxId = id + "-" + index2;
+      const checkboxControl = document.createElement("div");
+      const checkbox = document.createElement("input");
+      const label = document.createElement("label");
+      const labelText = document.createElement("span");
+      checkbox.setAttribute("type", "checkbox");
+      checkbox.setAttribute("id", checkboxId);
+      checkbox.setAttribute("name", id);
+      checkbox.setAttribute("value", value);
+      checkbox.setAttribute("aria-describedby", describedBy);
+      label.setAttribute("for", checkboxId);
+      labelText.textContent = titles && titles[index2] !== void 0 ? titles[index2] : value;
+      checkboxControl.appendChild(checkbox);
+      checkboxControl.appendChild(label);
+      label.appendChild(labelText);
+      this.control.checkboxes.push(checkbox);
+      this.control.labels.push(label);
+      this.control.labelTexts.push(labelText);
+      this.control.checkboxControls.push(checkboxControl);
+      this.control.fieldset.insertBefore(checkboxControl, this.control.description);
+    });
+    this.addEventListeners();
+    this.refreshUI();
+  }
   adaptForTable(td) {
     this.theme.adaptForTableCheckboxesControl(this.control, td);
   }
@@ -5117,6 +5691,15 @@ class EditorArrayCheckboxes extends Editor {
       checkbox.checked = value.includes(checkbox.value);
     });
   }
+  setAriaInvalid(invalid) {
+    this.control.checkboxes.forEach((checkbox) => {
+      if (invalid) {
+        checkbox.setAttribute("aria-invalid", "true");
+      } else {
+        checkbox.removeAttribute("aria-invalid");
+      }
+    });
+  }
 }
 class EditorNumberRange extends EditorNumber {
   static resolves(schema) {
@@ -5291,6 +5874,7 @@ class UiResolver {
       EditorNumberInputNullable,
       EditorMultiple,
       EditorIfThenElse,
+      EditorAnyJson,
       EditorRadios,
       EditorBooleanCheckbox,
       EditorBooleanSelect,
@@ -5629,14 +6213,17 @@ class Jedison extends EventEmitter {
       btnContents: true,
       btnIcons: true,
       arrayDelete: true,
+      arrayDeleteConfirm: true,
       arrayMove: true,
       arrayAdd: true,
+      objectAdd: true,
       arrayButtonsPosition: "left",
       startCollapsed: false,
       deactivateNonRequired: false,
       schema: {},
       showErrors: "change",
       switcherInput: "select",
+      embedSwitcher: false,
       data: void 0,
       assertFormat: false,
       customEditors: [],
@@ -5661,6 +6248,7 @@ class Jedison extends EventEmitter {
       enforceMinItems: true,
       enforceMaxItems: true,
       enforceEnum: true,
+      subErrors: false,
       debug: false
     }, options);
     this.rootName = "#";
@@ -5728,7 +6316,8 @@ class Jedison extends EventEmitter {
       refParser: this.refParser,
       assertFormat: this.options.assertFormat,
       translator: this.translator,
-      constraints: this.options.constraints
+      constraints: this.options.constraints,
+      subErrors: this.options.subErrors
     });
     this.root = this.createInstance({
       jedison: this,
@@ -6280,6 +6869,8 @@ class Theme {
     const dummyInputId = "legend-dummy-input-" + config.id;
     left.classList.add("jedi-editor-legend-left");
     right.classList.add("jedi-editor-legend-right");
+    right.style.display = "flex";
+    right.style.alignItems = "center";
     legend.classList.add("jedi-editor-legend");
     legend.style.fontSize = "inherit";
     legend.setAttribute("aria-labelledby", legendLabelId);
@@ -6495,6 +7086,18 @@ class Theme {
     });
     return toggle;
   }
+  getQuickAddPropertyToggle(config) {
+    const toggle = this.getButton(config);
+    toggle.classList.add("jedi-quick-add-property-toggle");
+    toggle.addEventListener("click", () => {
+      if (config.propertiesContainer.open) {
+        config.propertiesContainer.close();
+      } else {
+        config.propertiesContainer.showModal();
+      }
+    });
+    return toggle;
+  }
   /**
    * Container that will collapse and expand to show and hide it contents
    */
@@ -6557,6 +7160,17 @@ class Theme {
     });
     return html;
   }
+  getQuickAddPropertySlot(config) {
+    const html = document.createElement("dialog");
+    html.classList.add("jedi-quick-add-property-slot");
+    html.setAttribute("id", config.id);
+    window.addEventListener("click", (event) => {
+      if (event.target === html) {
+        html.close();
+      }
+    });
+    return html;
+  }
   /**
    * Container for properties editing elements like property activators
    */
@@ -6909,17 +7523,25 @@ class Theme {
       collapse,
       startCollapsed: config.startCollapsed
     });
-    const addPropertyControl = this.getInputControl({
+    const quickAddPropertyContainer = this.getQuickAddPropertySlot({
+      id: "quick-add-property-slot-" + config.id
+    });
+    const quickAddPropertyControl = this.getInputControl({
       type: "text",
-      id: "jedi-add-property-input-" + config.id,
+      id: "jedi-quick-add-property-input-" + config.id,
       title: config.addPropertyContent
     });
-    const addPropertyBtn = this.getAddPropertyButton({
+    const quickAddPropertyBtn = this.getAddPropertyButton({
       content: config.addPropertyContent,
       icon: "add"
     });
+    const quickAddPropertyToggle = this.getQuickAddPropertyToggle({
+      content: config.addPropertyContent,
+      icon: "add",
+      propertiesContainer: quickAddPropertyContainer
+    });
     const fieldset = this.getFieldset();
-    const { legend, infoContainer, legendText } = this.getLegend({
+    const { legend, infoContainer, legendText, right } = this.getLegend({
       content: config.title,
       id: config.id,
       titleHidden: config.titleHidden
@@ -6927,9 +7549,13 @@ class Theme {
     if (((_a = config == null ? void 0 : config.info) == null ? void 0 : _a.variant) === "modal") {
       this.infoAsModal(info, config.id, config.info);
     }
-    addPropertyBtn.classList.add("jedi-object-add");
     container.appendChild(fieldset);
     container.appendChild(propertiesContainer);
+    container.appendChild(quickAddPropertyContainer);
+    if (config.addProperty) {
+      quickAddPropertyContainer.appendChild(quickAddPropertyControl.container);
+      quickAddPropertyContainer.appendChild(quickAddPropertyBtn);
+    }
     if (config.editJsonData) {
       container.appendChild(jsonData.dialog);
     }
@@ -6943,18 +7569,19 @@ class Theme {
       body.appendChild(description);
     }
     body.appendChild(messages);
+    const switcherSlot = document.createElement("div");
+    switcherSlot.classList.add("jedi-switcher-slot");
     if (config.readOnly === false) {
-      legend.appendChild(actions);
+      right.appendChild(switcherSlot);
+      right.appendChild(actions);
     }
     body.appendChild(childrenSlot);
-    if (config.addProperty) {
-      propertiesContainer.appendChild(addPropertyControl.container);
-      propertiesContainer.appendChild(addPropertyBtn);
-      propertiesContainer.appendChild(document.createElement("hr"));
-    }
     if (config.editJsonData) {
       actions.appendChild(jsonData.toggle);
     }
+    if (config.addProperty) {
+      actions.appendChild(quickAddPropertyToggle);
+    }
     if (config.enablePropertiesToggle) {
       actions.appendChild(propertiesToggle);
       propertiesContainer.appendChild(ariaLive);
@@ -6975,13 +7602,17 @@ class Theme {
       propertiesToggle,
       jsonData,
       propertiesContainer,
-      addPropertyControl,
-      addPropertyBtn,
+      quickAddPropertyContainer,
+      quickAddPropertyControl,
+      quickAddPropertyBtn,
+      quickAddPropertyToggle,
       ariaLive,
       propertiesActivators,
       legend,
       legendText,
-      infoContainer
+      infoContainer,
+      right,
+      switcherSlot
     };
   }
   /**
@@ -7002,7 +7633,7 @@ class Theme {
     });
     const fieldset = this.getFieldset();
     const info = this.getInfo(config.info);
-    const { legend, legendText, infoContainer } = this.getLegend({
+    const { legend, legendText, infoContainer, right } = this.getLegend({
       content: config.title,
       id: config.id,
       titleHidden: config.titleHidden
@@ -7042,7 +7673,12 @@ class Theme {
       body.appendChild(description);
     }
     body.appendChild(messages);
-    legend.appendChild(actions);
+    const switcherSlot = document.createElement("div");
+    switcherSlot.classList.add("jedi-switcher-slot");
+    if (config.readOnly === false) {
+      right.appendChild(switcherSlot);
+      right.appendChild(actions);
+    }
     actions.appendChild(btnGroup);
     if (config.editJsonData) {
       btnGroup.appendChild(jsonData.toggle);
@@ -7066,7 +7702,8 @@ class Theme {
       addBtn,
       jsonData,
       legend,
-      legendText
+      legendText,
+      switcherSlot
     };
   }
   getArrayItem(config = {}) {
@@ -7102,8 +7739,10 @@ class Theme {
     const messages = this.getMessagesSlot();
     const childrenSlot = this.getChildrenSlot();
     const randomId = generateRandomID(5);
+    const knownSwitchers = ["select", "radios", "radios-inline"];
+    const switcherType = knownSwitchers.includes(config.switcher) ? config.switcher : "select";
     let switcher;
-    if (config.switcher === "select") {
+    if (switcherType === "select") {
       switcher = this.getSwitcherSelect({
         values: config.switcherOptionValues,
         titles: config.switcherOptionsLabels,
@@ -7111,10 +7750,11 @@ class Theme {
         id: config.id + "-switcher-" + randomId,
         label: config.id + "-switcher-" + randomId,
         titleHidden: true,
-        readOnly: config.readOnly
+        readOnly: config.readOnly,
+        noSpacing: true
       });
     }
-    if (config.switcher === "radios" || config.switcher === "radios-inline") {
+    if (switcherType === "radios" || switcherType === "radios-inline") {
       switcher = this.getSwitcherRadios({
         values: config.switcherOptionValues,
         titles: config.switcherOptionsLabels,
@@ -7123,7 +7763,8 @@ class Theme {
         label: config.id + "-switcher-" + randomId,
         titleHidden: true,
         readOnly: config.readOnly,
-        inline: config.switcher === "radios-inline"
+        inline: switcherType === "radios-inline",
+        noSpacing: true
       });
     }
     switcher.container.classList.add("jedi-switcher");
@@ -7661,6 +8302,8 @@ class Theme {
     tabList.classList.add("jedi-nav-list");
     return tabList;
   }
+  styleLegendWarning(span) {
+  }
   /**
    * A Tab is a wrapper for content
    */
@@ -7972,7 +8615,9 @@ class ThemeBootstrap3 extends Theme {
   getSelectControl(config) {
     const control = super.getSelectControl(config);
     const { container, input, label } = control;
-    container.classList.add("form-group");
+    if (!config.noSpacing) {
+      container.classList.add("form-group");
+    }
     input.classList.add("form-control");
     if (config.titleHidden) {
       this.visuallyHidden(label);
@@ -8272,7 +8917,9 @@ class ThemeBootstrap4 extends Theme {
   getRadiosControl(config) {
     const control = super.getRadiosControl(config);
     const { container, fieldset, radios, labels, labelTexts, radioControls, description, messages } = control;
-    container.classList.add("form-group");
+    if (!config.noSpacing) {
+      container.classList.add("form-group");
+    }
     radioControls.forEach((radioControl, index2) => {
       radioControl.classList.add("form-check");
       radios[index2].classList.add("form-check-input");
@@ -8344,7 +8991,9 @@ class ThemeBootstrap4 extends Theme {
   getSelectControl(config) {
     const control = super.getSelectControl(config);
     const { container, input } = control;
-    container.classList.add("form-group");
+    if (!config.noSpacing) {
+      container.classList.add("form-group");
+    }
     input.classList.add("form-control");
     return control;
   }
@@ -8553,6 +9202,9 @@ class ThemeBootstrap5 extends Theme {
     legend.classList.add("py-2");
     return superLegend;
   }
+  styleLegendWarning(span) {
+    span.classList.add("ms-1");
+  }
   getLabel(config) {
     const labelObj = super.getLabel(config);
     if (labelObj.icon.classList) {
@@ -8651,7 +9303,9 @@ class ThemeBootstrap5 extends Theme {
   getRadiosControl(config) {
     const control = super.getRadiosControl(config);
     const { container, fieldset, radios, labels, labelTexts, radioControls, description, messages } = control;
-    container.classList.add("mb-3");
+    if (!config.noSpacing) {
+      container.classList.add("mb-3");
+    }
     radioControls.forEach((radioControl, index2) => {
       radioControl.classList.add("form-check");
       radios[index2].classList.add("form-check-input");
@@ -8716,7 +9370,9 @@ class ThemeBootstrap5 extends Theme {
   getSelectControl(config) {
     const control = super.getSelectControl(config);
     const { container, input } = control;
-    container.classList.add("mb-3");
+    if (!config.noSpacing) {
+      container.classList.add("mb-3");
+    }
     input.classList.add("form-select");
     return control;
   }