@elderbyte/ngx-starter 20.4.7 → 20.4.8

package/fesm2022/elderbyte-ngx-starter.mjs

@@ -2036,54 +2036,54 @@ class PhoneFormatService {
      * Public API                                                              *
      *                                                                         *
      **************************************************************************/
-    formatPhoneNumber(number, countryCode, config) {
-        if (!config || !config.dialingCode) {
-            return this.handleWithoutConfig(number, countryCode);
-        }
-        else {
-            return this.applyFormattingPerConfig(number, config);
+    formatPhoneNumber(nr, config) {
+        if (!config?.countryCode) {
+            return nr;
         }
+        const phoneNrBody = this.preparePhoneNumberBody(nr, config);
+        const transformedBody = this.applyRegexTransform(phoneNrBody, config);
+        return this.addPrefix(transformedBody, config);
     }
     /***************************************************************************
      *                                                                         *
      * Private Methods                                                         *
      *                                                                         *
      **************************************************************************/
-    applyFormattingPerConfig(number, config) {
-        let phoneNrBody = this.preparePhoneNumberBody(number, config);
-        if (config.bodyFormat) {
-            const [regex, format] = config.bodyFormat;
-            phoneNrBody = phoneNrBody.replace(regex, format);
+    addPrefix(body, config) {
+        let prefix = '';
+        if (config.customPrefix !== undefined && config.customPrefix !== null) {
+            prefix = config.customPrefix;
+        }
+        else {
+            prefix = config.countryCode + ' ';
         }
-        const prefix = config.customPrefix ?? `${config.dialingCode} `;
-        return `${prefix}${phoneNrBody}`;
+        return `${prefix}${body}`;
     }
     preparePhoneNumberBody(number, config) {
         const clean = this.cleanNumberString(number);
-        const withoutDialingCode = this.removeDialingCode(clean, config.dialingCode);
-        return withoutDialingCode.replace(/^0+/, ''); // remove leading zeros
+        const withoutDialingCode = this.removeDialingCode(clean, config.countryCode);
+        const withoutLeadingZeros = withoutDialingCode.replace(/^0+/, '');
+        return withoutLeadingZeros;
     }
     cleanNumberString(number) {
-        const regex = /[^0-9+]/g; //
-        return number.replace(regex, '');
-    }
-    handleWithoutConfig(number, countryCode) {
-        if (!countryCode) {
-            return number;
-        }
-        else {
-            return countryCode + ' ' + number;
-        }
+        return number.replace(/[^0-9+]/g, '');
     }
-    removeDialingCode(phoneNr, dialingCode) {
-        const dialingCodeWithDoubleZero = dialingCode.replace('+', '00');
-        for (const prefix of [dialingCode, dialingCodeWithDoubleZero]) {
+    removeDialingCode(phoneNr, countryCode) {
+        const dialingCodeWithDoubleZero = countryCode.replace('+', '00');
+        for (const prefix of [countryCode, dialingCodeWithDoubleZero]) {
             if (phoneNr.startsWith(prefix)) {
                 return phoneNr.slice(prefix.length);
             }
         }
         return phoneNr;
     }
+    applyRegexTransform(phoneNrBody, config) {
+        if (!config?.bodyFormat) {
+            return phoneNrBody;
+        }
+        const [regex, format] = config.bodyFormat;
+        return phoneNrBody.replace(regex, format);
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: PhoneFormatService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: PhoneFormatService, providedIn: 'root' }); }
 }
@@ -2099,48 +2099,59 @@ class CountryPhoneFormatService {
         this.countryPhoneFormats = {
             '+41': {
                 country: 'CH',
-                dialingCode: '+41',
-                bodyFormat: [/^(\d{2})(\d{3})(\d{2})(\d{2})$/, '$1 $2 $3 $4'],
-                customPrefix: '0',
-            },
-            '0041': {
-                country: 'CH',
-                dialingCode: '+41',
+                countryCode: '+41',
                 bodyFormat: [/^(\d{2})(\d{3})(\d{2})(\d{2})$/, '$1 $2 $3 $4'],
                 customPrefix: '0',
             },
             '+423': {
                 country: 'LI',
-                dialingCode: '+423',
+                countryCode: '+423',
                 bodyFormat: [/^(\d{3})(\d{4})$/, '$1 $2'],
             },
             '+49': {
                 country: 'DE',
-                dialingCode: '+49',
+                countryCode: '+49',
             },
             '+43': {
                 country: 'AT',
-                dialingCode: '+43',
+                countryCode: '+43',
             },
             '+33': {
                 country: 'FR',
-                dialingCode: '+33',
+                countryCode: '+33',
             },
             '+44': {
                 country: 'GB',
-                dialingCode: '+44',
+                countryCode: '+44',
             },
             '+1': {
                 country: 'US',
-                dialingCode: '+1',
+                countryCode: '+1',
             },
         };
     }
-    getCountryPhoneFormat(dialingCode) {
-        return this.countryPhoneFormats[dialingCode] ?? null;
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+    getCountryPhoneFormat(countryCode) {
+        if (!countryCode) {
+            return null;
+        }
+        const cleanedCode = countryCode.replace(/^00/, '+');
+        if (this.countryPhoneFormats[cleanedCode]) {
+            return this.countryPhoneFormats[cleanedCode];
+        }
+        return {
+            country: null,
+            countryCode: cleanedCode,
+            bodyFormat: null,
+        };
     }
-    getCountry(dialingCode) {
-        return this.countryPhoneFormats[dialingCode]?.country ?? null;
+    getCountry(countryCode) {
+        const countryFormat = this.countryPhoneFormats[countryCode];
+        return countryFormat?.country || null;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: CountryPhoneFormatService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: CountryPhoneFormatService, providedIn: 'root' }); }
@@ -2159,7 +2170,7 @@ class PhonePipe {
     }
     transform(phoneNumber) {
         const countryPhoneFormat = this.countryPhoneFormats.getCountryPhoneFormat(phoneNumber.countryCode);
-        return this.phoneFormat.formatPhoneNumber(phoneNumber.number, phoneNumber.countryCode, countryPhoneFormat);
+        return this.phoneFormat.formatPhoneNumber(phoneNumber.number, countryPhoneFormat);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: PhonePipe, deps: [], target: i0.ɵɵFactoryTarget.Pipe }); }
     static { this.ɵpipe = i0.ɵɵngDeclarePipe({ minVersion: "14.0.0", version: "20.1.3", ngImport: i0, type: PhonePipe, isStandalone: true, name: "phone" }); }
@@ -25937,8 +25948,10 @@ class ElderMultiSelectBase extends ElderSelectBase {
             return valueLoadRequest$.pipe(map((loaded) => {
                 loaded.forEach((v, k) => existing.set(k, v));
                 return existing;
-            }), map((allValuesMap) => Array.from(allValuesMap.values())) // TODO Sort?
-            );
+            }), map((allValuesMap) => {
+                // Sort entities by id order
+                return ids.map((id) => allValuesMap.get(id)).filter((entity) => !!entity);
+            }));
         }
         else {
             this.logger.warn('Failed to select value by Ids: ' + ids + ' - DataContext not available.');