@ekzo-dev/bootstrap-addons 5.3.4 → 5.3.6

package/package.json

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

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

@@ -20,12 +20,12 @@ import type {
 import { coerceBoolean } from '@ekzo-dev/toolkit';
 import { JsonEditor } from '@ekzo-dev/vanilla-jsoneditor';
 import { faUpRightAndDownLeftFromCenter } from '@fortawesome/free-solid-svg-icons/faUpRightAndDownLeftFromCenter';
-import Ajv, { ErrorObject, Options } from 'ajv';
+import Ajv, { ErrorObject, Options, ValidateFunction } from 'ajv';
 import Ajv2019 from 'ajv/dist/2019';
 import Ajv2020 from 'ajv/dist/2020';
 import addFormats from 'ajv-formats';
 import { bindable, BindingMode, customElement } from 'aurelia';
-import { JSONValue, parsePath } from 'immutable-json-patch';
+import { parsePath } from 'immutable-json-patch';
 
 const patternMap: Record<string, string> = {
   '^[A-Za-z_][-A-Za-z0-9._]*$': '^[A-Za-z_][\\-A-Za-z0-9._]*$',
@@ -76,12 +76,13 @@ export class BsJsonInput {
 
   onRenderValue = (props: RenderValueProps): RenderValueComponentDescription[] => {
     let result: RenderValueComponentDescription[] | null;
-    const { jsonSchema } = this;
+    // const { jsonSchema } = this;
     const { editorModule } = this.editorComponent;
 
-    if (jsonSchema && typeof jsonSchema === 'object') {
-      result = editorModule.renderJSONSchemaEnum(props, jsonSchema, this.#getSchemaDefinitions(jsonSchema));
-    }
+    // TODO: this does not support bundled schemas and complex refs. So need to make own implementation later
+    // if (jsonSchema && typeof jsonSchema === 'object') {
+    //   result = editorModule.renderJSONSchemaEnum(props, jsonSchema, this.#getSchemaDefinitions(jsonSchema));
+    // }
 
     return result ?? editorModule.renderValue(props);
   };
@@ -156,15 +157,17 @@ export class BsJsonInput {
       const ajv = rawThis.#initAjv(jsonSchema.$schema as string, ajvOptions);
 
       addFormats(ajv);
-      const validate = ajv.compile(rawJsonSchema);
+      let validate: ValidateFunction;
 
-      if (validate.errors) {
-        throw validate.errors[0];
+      try {
+        validate = ajv.compile(rawJsonSchema);
+      } catch (e) {
+        console.error('Validator compilation error.', e);
       }
 
       return (json: unknown): ValidationError[] => {
         // do not validate empty documents
-        if (json === undefined) return [];
+        if (json === undefined || !validate) return [];
 
         validate(json);
 
@@ -236,7 +239,7 @@ export class BsJsonInput {
     this.input.setCustomValidity(errors?.length ? message : '');
 
     return (errors || []).map((error) => ({
-      path: parsePath(json as JSONValue, error.instancePath),
+      path: parsePath(json, error.instancePath),
       message: error.message || 'Unknown error',
       severity: 'warning' 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;