jedison 0.3.10 → 0.3.12

package/dist/esm/jedison.js

@@ -1811,8 +1811,15 @@ class Instance extends EventEmitter {
   }
   /**
    * Sets the instance value
+   * @returns {*} The final value after constraint enforcement
    */
   setValue(newValue, notifyParent = true, initiator = "api") {
+    if (this.value === newValue) {
+      return this.value;
+    }
+    if (typeof this.value !== "object" && typeof newValue !== "object" && this.value === newValue) {
+      return this.value;
+    }
     const enforceConst = getSchemaXOption(this.schema, "enforceConst") ?? this.jedison.options.enforceConst;
     if (isSet(enforceConst) && equal(enforceConst, true)) {
       const schemaConst = getSchemaConst(this.schema);
@@ -1821,14 +1828,18 @@ class Instance extends EventEmitter {
       }
     }
     const valueChanged = different(this.value, newValue);
+    if (!valueChanged) {
+      return this.value;
+    }
     this.value = newValue;
+    this.isDirty = true;
     this.emit("set-value", newValue, initiator);
-    if (valueChanged) {
-      this.isDirty = true;
-      this.emit("change", initiator);
-      this.jedison.emit("instance-change", this, initiator);
+    this.emit("change", initiator);
+    this.jedison.emit("instance-change", this, initiator);
+    if (notifyParent) {
       this.emit("notifyParent", initiator);
     }
+    return this.value;
   }
   /**
    * Fires when a child's instance state changes
@@ -1905,6 +1916,8 @@ class Editor {
     this.disabled = false;
     this.readOnly = this.instance.isReadOnly();
     this.showingValidationErrors = false;
+    this.markdownEnabled = false;
+    this.purifyEnabled = false;
     this.title = null;
     this.description = null;
     this.init();
@@ -1931,6 +1944,8 @@ class Editor {
    */
   init() {
     this.theme = this.instance.jedison.theme;
+    this.markdownEnabled = getSchemaXOption(this.instance.schema, "parseMarkdown") ?? this.instance.jedison.options.parseMarkdown;
+    this.purifyEnabled = getSchemaXOption(this.instance.schema, "purifyHtml") ?? this.instance.jedison.options.purifyHtml;
   }
   /**
    * Gets the json path level by counting how many "/" it has
@@ -2068,10 +2083,7 @@ class Editor {
     }
   }
   getHtmlFromMarkdown(content) {
-    if (this.instance.jedison.options.parseMarkdown && window.marked) {
-      return window.marked.parse(content);
-    }
-    return content;
+    return window.marked.parse(content);
   }
   getTitle() {
     let titleFromSchema = false;
@@ -2083,11 +2095,11 @@ class Editor {
     }
     if (titleFromSchema) {
       this.title = compileTemplate(this.title, this.instance.getTemplateData());
-      this.title = this.getHtmlFromMarkdown(this.title);
+      this.title = this.markdownEnabled ? this.getHtmlFromMarkdown(this.title) : this.title;
       const domPurifyOptions = combineDeep({}, this.instance.jedison.options.domPurifyOptions, {
         FORBID_TAGS: ["p"]
       });
-      this.title = this.purifyContent(this.title, domPurifyOptions);
+      this.title = this.purifyEnabled ? this.purifyContent(this.title, domPurifyOptions) : this.title;
     }
     return this.title;
   }
@@ -2095,9 +2107,9 @@ class Editor {
     const schemaDescription = getSchemaDescription(this.instance.schema);
     if (isSet(schemaDescription)) {
       this.description = compileTemplate(schemaDescription, this.instance.getTemplateData());
-      this.description = this.getHtmlFromMarkdown(this.description);
+      this.description = this.markdownEnabled ? this.getHtmlFromMarkdown(this.description) : this.description;
       const domPurifyOptions = this.instance.jedison.options.domPurifyOptions;
-      this.purifyContent(this.description, domPurifyOptions);
+      this.description = this.purifyEnabled ? this.purifyContent(this.description, domPurifyOptions) : this.description;
     }
     return this.description;
   }
@@ -2109,12 +2121,12 @@ class Editor {
     }
     const domPurifyOptions = this.instance.jedison.options.domPurifyOptions;
     if (isSet(schemaInfo.title)) {
-      schemaInfo.title = this.getHtmlFromMarkdown(schemaInfo.title);
-      schemaInfo.title = this.purifyContent(schemaInfo.title, domPurifyOptions);
+      schemaInfo.title = this.markdownEnabled ? this.getHtmlFromMarkdown(schemaInfo.title) : schemaInfo.title;
+      schemaInfo.title = this.purifyEnabled ? this.purifyContent(schemaInfo.title, domPurifyOptions) : schemaInfo.title;
     }
     if (isSet(schemaInfo.content)) {
-      schemaInfo.content = this.getHtmlFromMarkdown(schemaInfo.content);
-      schemaInfo.content = this.purifyContent(schemaInfo.content, domPurifyOptions);
+      schemaInfo.content = this.markdownEnabled ? this.getHtmlFromMarkdown(schemaInfo.content) : schemaInfo.content;
+      schemaInfo.content = this.purifyEnabled ? this.purifyContent(schemaInfo.content, domPurifyOptions) : schemaInfo.content;
     }
     return schemaInfo;
   }
@@ -2257,7 +2269,7 @@ class InstanceIfThenElse extends Instance {
         instance.children.forEach((child) => {
           const shouldUpdateValue = child.isMultiple && hasOwn(value, child.getKey());
           if (shouldUpdateValue) {
-            child.setValue(value[child.getKey()], false, "api");
+            child.setValue(value[child.getKey()], true, "api");
           }
         });
       }
@@ -2707,7 +2719,8 @@ class InstanceObject extends Instance {
         const oldValue = child.getValue();
         const newValue = value[child.getKey()];
         if (different(oldValue, newValue)) {
-          child.setValue(newValue, false, initiator);
+          const finalValue = child.setValue(newValue, false, initiator);
+          value[child.getKey()] = finalValue;
         }
       } else {
         const schema = this.getPropertySchema(propertyName);
@@ -2726,6 +2739,7 @@ class InstanceObject extends Instance {
       }
     }
     this.sortChildrenByPropertyOrder();
+    this.value = value;
   }
 }
 class InstanceArray extends Instance {
@@ -2815,11 +2829,14 @@ class InstanceArray extends Instance {
     if (!isArray(value)) {
       return;
     }
+    const correctedValues = [];
     value.forEach((itemValue, index2) => {
       const child = this.createItemInstance(index2);
       this.children.push(child);
-      child.setValue(itemValue, false);
+      const finalValue = child.setValue(itemValue, false);
+      correctedValues.push(finalValue);
     });
+    this.value = correctedValues;
   }
 }
 class InstanceString extends Instance {
@@ -4630,6 +4647,91 @@ class EditorArrayCheckboxes extends Editor {
     });
   }
 }
+class EditorNumberRange extends EditorNumber {
+  static resolves(schema) {
+    const schemaType = getSchemaType(schema);
+    const isNumericType = schemaType === "number" || schemaType === "integer";
+    if (!isNumericType) {
+      return false;
+    }
+    if (getSchemaXOption(schema, "format") === "range") {
+      return true;
+    }
+    const hasMin = isSet(schema.minimum) || isSet(schema.exclusiveMinimum);
+    const hasMax = isSet(schema.maximum) || isSet(schema.exclusiveMaximum);
+    return hasMin && hasMax;
+  }
+  build() {
+    let optionMin = 0;
+    let optionMax = 100;
+    if (isSet(this.instance.schema.minimum)) {
+      optionMin = this.instance.schema.minimum;
+    } else if (isSet(this.instance.schema.exclusiveMinimum)) {
+      optionMin = this.instance.schema.exclusiveMinimum + 0.01;
+    }
+    if (isSet(this.instance.schema.maximum)) {
+      optionMax = this.instance.schema.maximum;
+    } else if (isSet(this.instance.schema.exclusiveMaximum)) {
+      optionMax = this.instance.schema.exclusiveMaximum - 0.01;
+    }
+    let optionStep;
+    const schemaType = getSchemaType(this.instance.schema);
+    const multipleOf2 = this.instance.schema.multipleOf;
+    if (isSet(multipleOf2)) {
+      optionStep = multipleOf2;
+    } else if (schemaType === "integer") {
+      optionStep = 1;
+    } else {
+      optionStep = 0.01;
+    }
+    this.control = this.theme.getInputRangeControl({
+      title: this.getTitle(),
+      description: this.getDescription(),
+      type: "range",
+      id: this.getIdFromPath(this.instance.path),
+      titleIconClass: getSchemaXOption(this.instance.schema, "titleIconClass"),
+      titleHidden: getSchemaXOption(this.instance.schema, "titleHidden"),
+      info: this.getInfo()
+    });
+    this.control.input.setAttribute("min", optionMin);
+    this.control.input.setAttribute("max", optionMax);
+    this.control.input.setAttribute("step", optionStep);
+    const inputAttributes = getSchemaXOption(this.instance.schema, "inputAttributes");
+    if (inputAttributes && typeof inputAttributes === "object") {
+      Object.keys(inputAttributes).forEach((attr) => {
+        this.control.input.setAttribute(attr, inputAttributes[attr]);
+      });
+    }
+    const currentValue = this.instance.getValue();
+    this.control.output.textContent = currentValue !== void 0 ? currentValue : optionMin;
+  }
+  adaptForTable() {
+    this.theme.adaptForTableInputControl(this.control);
+  }
+  addEventListeners() {
+    this.control.input.addEventListener("change", () => {
+      const value = parseFloat(this.control.input.value);
+      this.control.output.textContent = value;
+      this.instance.setValue(value, true, "user");
+    });
+  }
+  sanitize(value) {
+    const schemaType = getSchemaType(this.instance.schema);
+    const numValue = Number(value);
+    if (schemaType === "integer") {
+      return Math.round(numValue);
+    }
+    return numValue;
+  }
+  refreshUI() {
+    super.refreshUI();
+    const currentValue = this.instance.getValue();
+    this.control.input.value = currentValue !== void 0 ? currentValue : 0;
+    if (this.control.output) {
+      this.control.output.textContent = currentValue !== void 0 ? currentValue : 0;
+    }
+  }
+}
 class UiResolver {
   constructor(options) {
     this.customEditors = options.customEditors ?? [];
@@ -4654,6 +4756,7 @@ class UiResolver {
       EditorStringInput,
       EditorNumberIMask,
       EditorNumberRaty,
+      EditorNumberRange,
       EditorNumberRadios,
       EditorNumberSelect,
       EditorNumberInput,
@@ -5004,7 +5107,7 @@ class Jedison extends EventEmitter {
     }, options);
     this.rootName = "#";
     this.pathSeparator = "/";
-    this.instances = {};
+    this.instances = /* @__PURE__ */ new Map();
     this.root = null;
     this.translator = new Translator({
       language: this.options.language,
@@ -5181,14 +5284,13 @@ class Jedison extends EventEmitter {
    * Adds a child instance pointer to the instances list
    */
   register(instance) {
-    this.instances[instance.path] = instance;
+    this.instances.set(instance.path, instance);
   }
   /**
    * Deletes a child instance pointer from the instances list
    */
   unregister(instance) {
-    this.instances[instance.path] = null;
-    delete this.instances[instance.path];
+    this.instances.delete(instance.path);
   }
   logIfEditor(...params) {
     if (this.isEditor) {
@@ -5346,7 +5448,7 @@ class Jedison extends EventEmitter {
    * @return {*}
    */
   getInstance(path) {
-    return this.instances[path];
+    return this.instances.get(path);
   }
   /**
    * Disables the root instance and it's children user interfaces
@@ -5367,25 +5469,23 @@ class Jedison extends EventEmitter {
    */
   getErrors(filters = ["error"]) {
     let results = [];
-    Object.keys(this.instances).forEach((key) => {
-      const instance = this.instances[key];
+    for (const instance of this.instances.values()) {
       results = [...results, ...instance.getErrors()];
-    });
+    }
     return results.filter((error) => {
       return filters.includes(error.type.toLowerCase());
     });
   }
   export() {
     const results = [];
-    Object.keys(this.instances).forEach((key) => {
-      const instance = this.instances[key];
+    for (const instance of this.instances.values()) {
       results.push({
         path: instance.path ?? "-",
         type: instance.schema.type ?? "-",
         title: instance.ui.getTitle() ?? "-",
         value: instance.getValue() ?? "-"
       });
-    });
+    }
     return results;
   }
   /**
@@ -5402,10 +5502,9 @@ class Jedison extends EventEmitter {
       return false;
     }
     const errors = errorsList ?? this.getErrors();
-    Object.keys(this.instances).forEach((key) => {
-      const instance = this.instances[key];
+    for (const instance of this.instances.values()) {
       instance.ui.showValidationErrors(errors, true);
-    });
+    }
   }
   watch(path, callback) {
     if (!this.watched[path]) {
@@ -6562,6 +6661,15 @@ class Theme {
     container.appendChild(actions);
     return { container, input, label, info, labelText, description, messages, actions };
   }
+  getInputRangeControl(config) {
+    const control = this.getInputControl(config);
+    const output = document.createElement("output");
+    output.className = "range-output";
+    output.style.marginLeft = "10px";
+    output.style.fontWeight = "bold";
+    control.input.parentNode.insertBefore(output, control.input.nextSibling);
+    return { ...control, output };
+  }
   adaptForTableInputControl(control) {
     this.visuallyHidden(control.label);
     this.visuallyHidden(control.description);
@@ -6929,7 +7037,7 @@ class Theme {
     const arrayActions = document.createElement("span");
     const text = document.createElement("span");
     link.classList.add("jedi-nav-link");
-    link.setAttribute("href", "#" + config.id);
+    link.setAttribute("href", "#tab-pane-" + config.id);
     text.classList.add("jedi-nav-text");
     text.textContent = config.hasErrors ? "⚠ " + config.title : config.title;
     link.appendChild(arrayActions);
@@ -6984,7 +7092,7 @@ class Theme {
    * Set tab attributes to make it toggleable
    */
   setTabPaneAttributes(element, active, id) {
-    element.setAttribute("id", id);
+    element.setAttribute("id", "tab-pane-" + id);
     element.classList.add("jedi-tab-pane");
   }
   /**
@@ -7139,6 +7247,9 @@ class ThemeBootstrap3 extends Theme {
     }
     return control;
   }
+  getInputRangeControl(config) {
+    return super.getInputRangeControl(config);
+  }
   adaptForTableInputControl(control, td) {
     super.adaptForTableInputControl(control, td);
     control.container.classList.remove("form-group");
@@ -7463,6 +7574,17 @@ class ThemeBootstrap4 extends Theme {
     }
     return control;
   }
+  getInputRangeControl(config) {
+    const control = super.getInputRangeControl(config);
+    const { container, input, label } = control;
+    container.classList.add("form-group");
+    input.classList.add("custom-range");
+    input.classList.remove("form-control");
+    if (config.titleHidden) {
+      this.visuallyHidden(label);
+    }
+    return control;
+  }
   adaptForTableInputControl(control, td) {
     super.adaptForTableInputControl(control, td);
     control.container.classList.remove("form-group");
@@ -7811,6 +7933,17 @@ class ThemeBootstrap5 extends Theme {
     }
     return control;
   }
+  getInputRangeControl(config) {
+    const control = super.getInputRangeControl(config);
+    const { container, input, label } = control;
+    container.classList.add("mb-3");
+    input.classList.add("form-range");
+    input.classList.remove("form-control");
+    if (config.titleHidden) {
+      this.visuallyHidden(label);
+    }
+    return control;
+  }
   adaptForTableInputControl(control, td) {
     super.adaptForTableInputControl(control, td);
     control.container.classList.remove("mb-3");
@@ -8039,6 +8172,7 @@ const index = {
   EditorStringTextarea,
   EditorStringAwesomplete,
   EditorStringInput,
+  EditorNumberRange,
   EditorNumber,
   EditorNumberRadios,
   EditorNumberSelect,