jedison 1.22.3 → 1.23.1

package/dist/esm/jedison.js

@@ -3126,7 +3126,11 @@ class InstanceObject extends Instance {
     const initialValue = clone(this.value);
     if (isSet(schemaProperties)) {
       Object.keys(schemaProperties).forEach((key) => {
-        const schema = schemaProperties[key];
+        let schema = schemaProperties[key];
+        if (isObject$1(schema) && this.jedison.refParser && this.jedison.refParser.hasRef(schema) && !schema["x-recursive"]) {
+          schema = this.jedison.refParser.expand(schema);
+          schemaProperties[key] = schema;
+        }
         this.properties[key] = { schema };
         let musstCreateChild = true;
         const isRecursive = isSet(schema["x-recursive"]);
@@ -3364,10 +3368,15 @@ class InstanceObject extends Instance {
         this.createChild(schema, propertyName, value[propertyName], true);
       }
     });
+    const keepMissingSchemaFields = this.jedison.getOption("keepMissingSchemaFields");
     for (let i = this.children.length - 1; i >= 0; i--) {
       const instance = this.children[i];
       const propertyName = instance.getKey();
       if (notSet(value[propertyName])) {
+        const isSchemaProperty = hasOwn(this.properties, propertyName);
+        if (isSchemaProperty && keepMissingSchemaFields) {
+          continue;
+        }
         if (childMap.has(propertyName)) {
           instance.deactivate();
         } else {
@@ -4362,7 +4371,8 @@ class EditorObject extends Editor {
   getObjectControlConfig() {
     let addProperty = true;
     const additionalProperties2 = getSchemaAdditionalProperties(this.instance.schema);
-    if (isSet(additionalProperties2) && additionalProperties2 === false) {
+    const patternProperties2 = getSchemaPatternProperties(this.instance.schema);
+    if (isSet(additionalProperties2) && additionalProperties2 === false && !isSet(patternProperties2)) {
       addProperty = false;
     }
     const objectAdd = getSchemaXOption(this.instance.schema, "objectAdd") ?? this.instance.jedison.getOption("objectAdd");
@@ -4421,10 +4431,38 @@ class EditorObject extends Editor {
     ariaLiveMessage.textContent = label + " " + this.instance.jedison.translator.translate("objectPropertyAdded");
     this.control.ariaLive.appendChild(ariaLiveMessage);
   }
+  /**
+   * A name is only rejected when `additionalProperties: false` is enforced and the
+   * name matches neither `properties` nor `patternProperties` (issue #82) - mirrors
+   * the check InstanceObject.removeNotListedPropertiesFromValue() applies on setValue.
+   */
+  isAddPropertyNameAllowed(propertyName) {
+    const additionalProperties2 = getSchemaAdditionalProperties(this.instance.schema);
+    if (!isSet(additionalProperties2) || additionalProperties2 !== false) {
+      return true;
+    }
+    const schemaEnforceAdditionalProperties = getSchemaXOption(this.instance.schema, "enforceAdditionalProperties");
+    const enforceAdditionalProperties = isSet(schemaEnforceAdditionalProperties) ? schemaEnforceAdditionalProperties : this.instance.jedison.getOption("enforceAdditionalProperties");
+    if (!enforceAdditionalProperties) {
+      return true;
+    }
+    const declaredProperties = getSchemaProperties(this.instance.schema) || {};
+    if (hasOwn(declaredProperties, propertyName)) {
+      return true;
+    }
+    const patternProperties2 = getSchemaPatternProperties(this.instance.schema) || {};
+    return Object.keys(patternProperties2).some((pattern2) => new RegExp(pattern2).test(propertyName));
+  }
   addProperty(input, postAction) {
     const propertyName = input.value.split(" ").join("");
     if (propertyName.length === 0) return;
     if (isSet(this.instance.value[propertyName])) return;
+    this.control.quickAddPropertyControl.messages.replaceChildren();
+    if (!this.isAddPropertyNameAllowed(propertyName)) {
+      const message = compileTemplate(this.instance.jedison.translator.translate("errorAddPropertyPatternMismatch"), { property: propertyName });
+      this.control.quickAddPropertyControl.messages.appendChild(this.getErrorFeedback({ message }));
+      return;
+    }
     const schema = this.instance.getPropertySchema(propertyName);
     const child = this.instance.createChild(schema, propertyName);
     child.activate();
@@ -7236,6 +7274,7 @@ class UiResolver {
   }
 }
 const defaultTranslations = {
+  errorAddPropertyPatternMismatch: 'Property name "{{ property }}" does not match any allowed property or pattern.',
   errorAdditionalProperties: 'Has additional property "{{ property }}" but no additional properties are allowed.',
   errorAnyOf: "Must validate against at least one of the provided schemas.",
   errorConst: "Must have value of: {{ const }}.",
@@ -7284,6 +7323,7 @@ const defaultTranslations = {
 };
 const translations = {
   en: {
+    errorAddPropertyPatternMismatch: 'Property name "{{ property }}" does not match any allowed property or pattern.',
     errorAdditionalProperties: 'Has additional property "{{ property }}" but no additional properties are allowed.',
     errorAnyOf: "Must validate against at least one of the provided schemas.",
     errorConst: "Must have value of: {{ const }}.",
@@ -7330,6 +7370,7 @@ const translations = {
     collapseToggle: "Collapse"
   },
   de: {
+    errorAddPropertyPatternMismatch: 'Der Eigenschaftsname "{{ property }}" entspricht keiner erlaubten Eigenschaft oder keinem erlaubten Muster.',
     errorAdditionalProperties: 'Hat die zusätzliche Eigenschaft "{{ property }}", aber keine zusätzlichen Eigenschaften sind erlaubt.',
     errorAnyOf: "Muss mindestens einem der bereitgestellten Schemata entsprechen.",
     errorConst: "Muss den Wert {{ const }} haben.",
@@ -7376,6 +7417,7 @@ const translations = {
     collapseToggle: "Einklappen"
   },
   it: {
+    errorAddPropertyPatternMismatch: 'Il nome della proprietà "{{ property }}" non corrisponde a nessuna proprietà o modello consentito.',
     errorAdditionalProperties: 'Ha la proprietà aggiuntiva "{{ property }}" ma non sono consentite proprietà aggiuntive.',
     errorAnyOf: "Deve rispettare almeno uno degli schemi forniti.",
     errorConst: "Deve avere il valore: {{ const }}.",
@@ -7422,6 +7464,7 @@ const translations = {
     collapseToggle: "Comprimi"
   },
   es: {
+    errorAddPropertyPatternMismatch: 'El nombre de propiedad "{{ property }}" no coincide con ninguna propiedad o patrón permitido.',
     errorAdditionalProperties: 'Tiene la propiedad adicional "{{ property }}" pero no se permiten propiedades adicionales.',
     errorAnyOf: "Debe cumplir con al menos uno de los esquemas proporcionados.",
     errorConst: "Debe tener el valor: {{ const }}.",
@@ -7515,7 +7558,7 @@ class JsonWalker {
     }
   }
 }
-const version = "1.22.3";
+const version = "1.23.1";
 class Jedison extends EventEmitter {
   /**
    * Creates a Jedison instance.
@@ -7578,7 +7621,9 @@ class Jedison extends EventEmitter {
       subErrors: false,
       debug: false,
       audacity: true,
-      switcherTypeLabels: {}
+      switcherTypeLabels: {},
+      keepMissingSchemaFields: false
+      // for backwards compatibility
     }, options);
     this.rootName = "#";
     this.pathSeparator = "/";