@xlabs-store/core 0.0.1 → 0.0.3

package/dist/collection/components/x-form-builder/services/forms/form-group.js

@@ -15,7 +15,7 @@ export class FormGroup extends AbstractControl {
         }
         super(validators, asyncValidatorsList);
         this._controls = controls;
-        Object.values(controls).forEach((control) => {
+        Object.values(controls).forEach(control => {
             control.setParent(this);
         });
         this.updateValueAndValidity({ emitEvent: false });
@@ -25,7 +25,7 @@ export class FormGroup extends AbstractControl {
     }
     get value() {
         const value = {};
-        Object.keys(this._controls).forEach((key) => {
+        Object.keys(this._controls).forEach(key => {
             const control = this._controls[key];
             if (!control.disabled) {
                 value[key] = control.value;
@@ -34,7 +34,7 @@ export class FormGroup extends AbstractControl {
         return value;
     }
     setValue(value, options = {}) {
-        Object.keys(value).forEach((key) => {
+        Object.keys(value).forEach(key => {
             if (!this._controls[key]) {
                 throw new Error(`Cannot find form control with name: ${key}`);
             }
@@ -44,7 +44,7 @@ export class FormGroup extends AbstractControl {
         this.updateValueAndValidity(options);
     }
     patchValue(value, options = {}) {
-        Object.keys(value).forEach((key) => {
+        Object.keys(value).forEach(key => {
             if (this._controls[key]) {
                 this._controls[key].patchValue(value[key], { emitEvent: false });
             }
@@ -52,7 +52,7 @@ export class FormGroup extends AbstractControl {
         this.updateValueAndValidity(options);
     }
     reset(value = {}, options = {}) {
-        Object.keys(this._controls).forEach((key) => {
+        Object.keys(this._controls).forEach(key => {
             this._controls[key].reset(value[key], { emitEvent: false });
         });
         this.markAsPristine();
@@ -142,7 +142,7 @@ export class FormGroup extends AbstractControl {
     }
     getRawValue() {
         const value = {};
-        Object.keys(this._controls).forEach((key) => {
+        Object.keys(this._controls).forEach(key => {
             value[key] = this._controls[key].value;
         });
         return value;

package/dist/collection/components/x-form-builder/services/forms/validators.js

@@ -1,8 +1,7 @@
 export class Validators {
     static required(control) {
         const value = control.value;
-        if (value === null || value === undefined || value === '' ||
-            (Array.isArray(value) && value.length === 0)) {
+        if (value === null || value === undefined || value === '' || (Array.isArray(value) && value.length === 0)) {
             return { required: true };
         }
         return null;
@@ -29,20 +28,18 @@ export class Validators {
     }
     static minLength(minLength) {
         return (control) => {
-            if (!control.value || typeof control.value !== 'string')
+            if (control.value === null || control.value === undefined || control.value === '')
                 return null;
-            return control.value.length < minLength
-                ? { minLength: { minLength: minLength, actualLength: control.value.length } }
-                : null;
+            const value = String(control.value);
+            return value.length < minLength ? { minLength: { minLength: minLength, actualLength: value.length } } : null;
         };
     }
     static maxLength(maxLength) {
         return (control) => {
-            if (!control.value || typeof control.value !== 'string')
+            if (control.value === null || control.value === undefined || control.value === '')
                 return null;
-            return control.value.length > maxLength
-                ? { maxLength: { maxLength: maxLength, actualLength: control.value.length } }
-                : null;
+            const value = String(control.value);
+            return value.length > maxLength ? { maxLength: { maxLength: maxLength, actualLength: value.length } } : null;
         };
     }
     static pattern(pattern) {
@@ -80,4 +77,17 @@ export class Validators {
         const num = Number(control.value);
         return !isNaN(num) ? null : { number: true };
     }
+    static sameAs(fieldName) {
+        return (control) => {
+            if (!control.value)
+                return null;
+            const parent = control.parent;
+            if (!parent || typeof parent.get !== 'function')
+                return null;
+            const targetControl = parent.get(fieldName);
+            if (!targetControl)
+                return null;
+            return control.value === targetControl.value ? null : { sameAs: { fieldName } };
+        };
+    }
 }

package/dist/collection/components/x-form-builder/services/schema/condition-builder.js

@@ -21,16 +21,30 @@ export class ConditionOperators {
     }
     equals(option, field, value) {
         value = ValueUtil.detect(field, value);
+        if ((typeof value === 'string' && typeof option.value === 'number') ||
+            (typeof value === 'number' && typeof option.value === 'string')) {
+            return String(value) === String(option.value);
+        }
         return option.value === value;
     }
     notEquals(option, field, value) {
         value = ValueUtil.detect(field, value);
+        if ((typeof value === 'string' && typeof option.value === 'number') ||
+            (typeof value === 'number' && typeof option.value === 'string')) {
+            return String(value) !== String(option.value);
+        }
         return option.value !== value;
     }
     contains(option, field, value) {
         value = ValueUtil.detect(field, value);
         if (Array.isArray(value)) {
-            return value.includes(option.value);
+            return value.some(item => {
+                if ((typeof item === 'string' && typeof option.value === 'number') ||
+                    (typeof item === 'number' && typeof option.value === 'string')) {
+                    return String(item) === String(option.value);
+                }
+                return item === option.value;
+            });
         }
         if (typeof value === 'string') {
             return value.includes(String(option.value));
@@ -40,9 +54,7 @@ export class ConditionOperators {
     greaterThan(option, field, value) {
         value = ValueUtil.detect(field, value);
         if (typeof value === 'number') {
-            const cmp = typeof option.value === 'number'
-                ? option.value
-                : Number(option.value ?? NaN);
+            const cmp = typeof option.value === 'number' ? option.value : Number(option.value ?? NaN);
             return Number.isFinite(cmp) ? value > cmp : false;
         }
         return false;
@@ -50,29 +62,29 @@ export class ConditionOperators {
     lessThan(option, field, value) {
         value = ValueUtil.detect(field, value);
         if (typeof value === 'number') {
-            const cmp = typeof option.value === 'number'
-                ? option.value
-                : Number(option.value ?? NaN);
+            const cmp = typeof option.value === 'number' ? option.value : Number(option.value ?? NaN);
             return Number.isFinite(cmp) ? value < cmp : false;
         }
         return false;
     }
     isEmpty(_option, field, value) {
         value = ValueUtil.detect(field, value);
-        return (value == null ||
-            value === '' ||
-            (Array.isArray(value) && value.length === 0));
+        return value == null || value === '' || (Array.isArray(value) && value.length === 0);
     }
     isNotEmpty(_option, field, value) {
         value = ValueUtil.detect(field, value);
-        return !(value == null ||
-            value === '' ||
-            (Array.isArray(value) && value.length === 0));
+        return !(value == null || value === '' || (Array.isArray(value) && value.length === 0));
     }
     notContains(option, field, value) {
         value = ValueUtil.detect(field, value);
         if (Array.isArray(value)) {
-            return !value.includes(option.value);
+            return !value.some(item => {
+                if ((typeof item === 'string' && typeof option.value === 'number') ||
+                    (typeof item === 'number' && typeof option.value === 'string')) {
+                    return String(item) === String(option.value);
+                }
+                return item === option.value;
+            });
         }
         if (typeof value === 'string') {
             return !value.includes(String(option.value));
@@ -82,9 +94,7 @@ export class ConditionOperators {
     greaterThanOrEqual(option, field, value) {
         value = ValueUtil.detect(field, value);
         if (typeof value === 'number') {
-            const cmp = typeof option.value === 'number'
-                ? option.value
-                : Number(option.value ?? NaN);
+            const cmp = typeof option.value === 'number' ? option.value : Number(option.value ?? NaN);
             return Number.isFinite(cmp) ? value >= cmp : false;
         }
         return false;
@@ -92,9 +102,7 @@ export class ConditionOperators {
     lessThanOrEqual(option, field, value) {
         value = ValueUtil.detect(field, value);
         if (typeof value === 'number') {
-            const cmp = typeof option.value === 'number'
-                ? option.value
-                : Number(option.value ?? NaN);
+            const cmp = typeof option.value === 'number' ? option.value : Number(option.value ?? NaN);
             return Number.isFinite(cmp) ? value <= cmp : false;
         }
         return false;
@@ -116,26 +124,48 @@ export class ConditionOperators {
     in(option, field, value) {
         value = ValueUtil.detect(field, value);
         if (Array.isArray(option.value)) {
-            return option.value.includes(value);
+            return option.value.some(item => {
+                if ((typeof item === 'string' && typeof value === 'number') ||
+                    (typeof item === 'number' && typeof value === 'string')) {
+                    return String(item) === String(value);
+                }
+                return item === value;
+            });
         }
         if (typeof option.value === 'string') {
             return option.value
                 .split(',')
-                .map((v) => v.trim())
-                .includes(String(value));
+                .map(v => v.trim())
+                .some(item => {
+                if (typeof value === 'number') {
+                    return item === String(value);
+                }
+                return item === value;
+            });
         }
         return false;
     }
     notIn(option, field, value) {
         value = ValueUtil.detect(field, value);
         if (Array.isArray(option.value)) {
-            return !option.value.includes(value);
+            return !option.value.some(item => {
+                if ((typeof item === 'string' && typeof value === 'number') ||
+                    (typeof item === 'number' && typeof value === 'string')) {
+                    return String(item) === String(value);
+                }
+                return item === value;
+            });
         }
         if (typeof option.value === 'string') {
             return !option.value
                 .split(',')
-                .map((v) => v.trim())
-                .includes(String(value));
+                .map(v => v.trim())
+                .some(item => {
+                if (typeof value === 'number') {
+                    return item === String(value);
+                }
+                return item === value;
+            });
         }
         return true;
     }
@@ -167,12 +197,12 @@ export class ConditionBuilder extends ConditionOperators {
     }
     checkAll() {
         this.isCheckingAll = true;
-        this.executors.forEach((executor) => executor());
+        this.executors.forEach(executor => executor());
         this.isCheckingAll = false;
         this.builder.notifySubscribers();
     }
     extract() {
-        this.conditions.forEach((cond) => {
+        this.conditions.forEach(cond => {
             if ('when' in cond) {
                 this.advanced(cond);
             }
@@ -204,14 +234,12 @@ export class ConditionBuilder extends ConditionOperators {
         const executor = () => {
             const values = this.getEvaluationValues();
             this.builder.callEvent('beforeConditionCheck', option, values);
-            const statuses = option.conditions.map((cond) => {
+            const statuses = option.conditions.map(cond => {
                 return this.run(cond, values, this.builder.context);
             });
-            const groupStatus = option.operator === 'and'
-                ? statuses.every(Boolean)
-                : statuses.some(Boolean);
+            const groupStatus = option.operator === 'and' ? statuses.every(Boolean) : statuses.some(Boolean);
             if (groupStatus) {
-                option.actions.forEach((action) => {
+                option.actions.forEach(action => {
                     this.execute(action.action, action.actionField);
                 });
             }
@@ -220,11 +248,11 @@ export class ConditionBuilder extends ConditionOperators {
                 this.builder.notifySubscribers();
             }
         };
-        option.conditions.forEach((cond) => {
+        option.conditions.forEach(cond => {
             const field = this.form.mapping.get(cond.field);
             if (field && 'control' in field && field.control) {
                 const control = field.control;
-                control.subscribe((_val) => executor());
+                control.subscribe(_val => executor());
             }
         });
         this.executors.push(executor);
@@ -234,9 +262,8 @@ export class ConditionBuilder extends ConditionOperators {
         const executor = () => {
             const values = this.getEvaluationValues();
             this.builder.callEvent('beforeConditionCheck', option, values);
-            const results = option.when.rules.map((rule) => {
-                const field = this.form.mappingById.get(rule.field) ??
-                    this.form.mapping.get(rule.field);
+            const results = option.when.rules.map(rule => {
+                const field = this.form.mappingById.get(rule.field) ?? this.form.mapping.get(rule.field);
                 if (field || rule.field?.startsWith('$')) {
                     const mockCond = {
                         id: option.id,
@@ -244,19 +271,18 @@ export class ConditionBuilder extends ConditionOperators {
                         condition: rule.operator,
                         value: rule.value,
                         action: 'show',
-                        actionField: 'none'
+                        actionField: 'none',
                     };
                     return this.run(mockCond, values, this.builder.context);
                 }
                 return false;
             });
             const isMatch = option.when.operator === 'or' ? results.some(Boolean) : results.every(Boolean);
-            const actions = isMatch ? option.then : (option.else || []);
-            actions.forEach((action) => {
-                const targetField = this.form.mappingById.get(action.target) ??
-                    this.form.mapping.get(action.target);
+            const actions = isMatch ? option.then : option.else || [];
+            actions.forEach(action => {
+                const targetField = this.form.mappingById.get(action.target) ?? this.form.mapping.get(action.target);
                 // If targetField found, use its id as key to execute (execute will resolve correctly)
-                const targetKey = targetField ? (targetField.id || targetField.name) : action.target;
+                const targetKey = targetField ? targetField.id || targetField.name : action.target;
                 this.execute(action.action, targetKey, action.value);
             });
             this.builder.callEvent('afterConditionCheck', option, values, isMatch);
@@ -264,9 +290,8 @@ export class ConditionBuilder extends ConditionOperators {
                 this.builder.notifySubscribers();
             }
         };
-        option.when.rules.forEach((rule) => {
-            const field = this.form.mappingById.get(rule.field) ??
-                this.form.mapping.get(rule.field);
+        option.when.rules.forEach(rule => {
+            const field = this.form.mappingById.get(rule.field) ?? this.form.mapping.get(rule.field);
             if (field && 'control' in field && field.control) {
                 field.control.subscribe(() => executor());
             }
@@ -298,9 +323,7 @@ export class ConditionBuilder extends ConditionOperators {
         executor();
     }
     execute(action, actionField, value) {
-        const actionFieldIds = actionField === 'all'
-            ? Array.from(this.form.mapping.keys())
-            : [actionField];
+        const actionFieldIds = actionField === 'all' ? Array.from(this.form.mapping.keys()) : [actionField];
         for (const fieldId of actionFieldIds) {
             const field = this.form.mappingById.get(fieldId) || this.form.mapping.get(fieldId);
             console.log(`[ConditionEngine] Executing action '${action}' on field '${fieldId}'. Field found:`, !!field, 'Value:', value);