@ekzo-dev/bootstrap-addons 5.3.5 → 5.3.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ekzo-dev/bootstrap-addons",
   "description": "Aurelia Bootstrap additional component",
-  "version": "5.3.5",
+  "version": "5.3.7",
   "homepage": "https://github.com/ekzo-dev/aurelia-components/tree/main/packages/bootstrap-addons",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
     "@js-temporal/polyfill": "^0.5.1",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
-    "json-schema-library": "^10.2.1"
+    "json-schema-library": "^10.5.1"
   },
   "peerDependencies": {
     "aurelia": "^2.0.0-beta.25",

package/src/forms/json-input/json-input.ts

@@ -26,6 +26,7 @@ import Ajv2020 from 'ajv/dist/2020';
 import addFormats from 'ajv-formats';
 import { bindable, BindingMode, customElement } from 'aurelia';
 import { parsePath } from 'immutable-json-patch';
+import { compileSchema, JsonError, JsonSchema, SchemaNode } from 'json-schema-library';
 
 const patternMap: Record<string, string> = {
   '^[A-Za-z_][-A-Za-z0-9._]*$': '^[A-Za-z_][\\-A-Za-z0-9._]*$',
@@ -158,20 +159,38 @@ export class BsJsonInput {
 
       addFormats(ajv);
       let validate: ValidateFunction;
+      let schema: SchemaNode;
+
+      try {
+        schema = compileSchema(rawJsonSchema as JsonSchema);
+      } catch (e) {
+        console.error('json-schema-library validator compilation error', e);
+      }
 
       try {
         validate = ajv.compile(rawJsonSchema);
       } catch (e) {
-        console.error('Validator compilation error.', e);
+        console.error('AJV validator compilation error', e);
       }
 
       return (json: unknown): ValidationError[] => {
         // do not validate empty documents
-        if (json === undefined || !validate) return [];
+        if (json === undefined) return [];
 
-        validate(json);
+        let allErrors: ValidationError[] = [];
+
+        if (schema) {
+          const { errors } = schema.validate(json);
+
+          allErrors = rawThis.#processErrors(errors, json);
+        }
+
+        if (validate) {
+          validate(json);
+          allErrors = allErrors.concat(rawThis.#processErrorsAjv(validate.errors, json));
+        }
 
-        return rawThis.#processErrors(validate.errors, json);
+        return allErrors;
       };
     } else if (schemaVersion != null && !disabled) {
       const ajv = rawThis.#initAjv(schemaVersion, ajvOptions);
@@ -182,7 +201,7 @@ export class BsJsonInput {
 
         void ajv.validateSchema(json);
 
-        return rawThis.#processErrors(ajv.errors, json);
+        return rawThis.#processErrorsAjv(ajv.errors, json);
       };
     }
   }
@@ -233,7 +252,7 @@ export class BsJsonInput {
     return (schema.$defs ?? schema.definitions) as JSONSchemaDefinitions;
   }
 
-  #processErrors(errors: ErrorObject[] | null, json: unknown): ValidationError[] {
+  #processErrorsAjv(errors: ErrorObject[] | null, json: unknown): ValidationError[] {
     const message = this.jsonSchema === true ? 'JSON is not a valid JSONSchema' : 'JSON does not match schema';
 
     this.input.setCustomValidity(errors?.length ? message : '');
@@ -244,4 +263,16 @@ export class BsJsonInput {
       severity: 'warning' as ValidationSeverity,
     }));
   }
+
+  #processErrors(errors: JsonError[] | null, json: unknown): ValidationError[] {
+    const message = this.jsonSchema === true ? 'JSON is not a valid JSONSchema' : 'JSON does not match schema';
+
+    this.input.setCustomValidity(errors?.length ? message : '');
+
+    return (errors || []).map((error) => ({
+      path: parsePath(json, error.data.pointer),
+      message: error.message || 'Unknown error',
+      severity: 'error' as ValidationSeverity,
+    }));
+  }
 }

package/src/forms/select/select.ts

@@ -33,27 +33,18 @@ export class BsSelect extends BaseBsSelect implements ICustomElementViewModel {
 
   filter: string = '';
 
-  optionsCount: number = 0;
-
-  deactivating: boolean = false;
-
   emptyOption?: ISelectOption;
 
   popperConfig: Partial<Options> | Tooltip.PopperConfigFunction | null = null;
 
   binding() {
     super.binding();
-    this.deactivating = false;
 
     if (this.multiple && !Array.isArray(this.value)) {
       this.value = [];
     }
   }
 
-  unbinding() {
-    this.deactivating = true;
-  }
-
   attached() {
     this.setPopperConfig();
   }
@@ -100,6 +91,8 @@ export class BsSelect extends BaseBsSelect implements ICustomElementViewModel {
   }
 
   get showClear(): boolean {
+    console.warn(`BsSelect #${this.id}: get showClear`);
+
     return (
       !this.disabled &&
       ((this.emptyOption && this.selectedOption?.value !== this.emptyOption.value) ||
@@ -119,14 +112,18 @@ export class BsSelect extends BaseBsSelect implements ICustomElementViewModel {
     this.control.dispatchEvent(change);
   }
 
-  get selectedOption(): ISelectOption | undefined {
-    const thisRaw = this['__raw__'] as this;
+  get optionsCount(): number {
+    const { options } = this;
+    const isObj = options instanceof Object && options.constructor === Object;
 
-    if (thisRaw.deactivating || this.multiple) return;
+    return isObj ? Object.keys(options).length : (options as []).length;
+  }
 
-    const { value, emptyValue } = this;
-    // take matcher from unproxied object to avoid unnecessary getter call
-    const { matcher } = thisRaw;
+  get selectedOption(): ISelectOption | undefined {
+    console.warn(`BsSelect #${this.id}: get selectedOption`);
+    if (this.multiple) return;
+
+    const { value, emptyValue, matcher } = this;
     let { options } = this;
     let emptyOption: ISelectOption;
 
@@ -134,8 +131,6 @@ export class BsSelect extends BaseBsSelect implements ICustomElementViewModel {
       options = Object.entries(options);
     }
 
-    this.optionsCount = (options as []).length;
-
     const isEntries = Array.isArray(options[0]);
     let option = (options as Array<ISelectOption | readonly [unknown, string]>).find((option) => {
       const optionValue: unknown = isEntries ? option[0] : (option as ISelectOption).value;