@etsoo/shared 1.1.79 → 1.1.81

package/README.md

@@ -161,6 +161,7 @@ DOM/window related utilities
 |Name|Description|
 |---:|---|
 |clearFormData|Clear form data|
+|CultureMatch|Culture match case Enum|
 |dataAs|Cast data as template format|
 |detectedCountry|Current detected country|
 |detectedCulture|Current detected culture|

package/__tests__/DomUtils.ts

@@ -221,17 +221,33 @@ test('Tests for detectedCulture', () => {
 test('Tests for getCulture', () => {
     const cultures: DataTypes.CultureDefinition[] = [
         {
-            name: 'zh-CN',
+            name: 'zh-Hans',
             label: '简体中文',
             resources: {},
-            compatibleName: ['zh-SG']
+            compatibleNames: ['zh-CN', 'zh-SG']
         },
-        { name: 'en-US', label: 'English', resources: {} }
+        { name: 'en', label: 'English', resources: {} }
     ];
 
-    expect(DomUtils.getCulture(cultures, 'zh-CN')?.name).toBe('zh-CN');
-    expect(DomUtils.getCulture(cultures, 'zh-SG')?.name).toBe('zh-CN');
-    expect(DomUtils.getCulture(cultures, 'en-GB')?.name).toBe('en-US');
+    const [culture1, match1] = DomUtils.getCulture(cultures, 'zh-CN');
+    expect(culture1?.name).toBe('zh-Hans');
+    expect(match1).toBe(DomUtils.CultureMatch.Compatible);
+
+    const [culture2] = DomUtils.getCulture(cultures, 'zh-Hans-CN');
+    expect(culture2?.name).toBe('zh-Hans');
+
+    const [culture3] = DomUtils.getCulture(cultures, 'zh-Hans-HK');
+    expect(culture3?.name).toBe('zh-Hans');
+
+    const [culture4] = DomUtils.getCulture(cultures, 'zh-SG');
+    expect(culture4?.name).toBe('zh-Hans');
+
+    const [culture5] = DomUtils.getCulture(cultures, 'en-GB');
+    expect(culture5?.name).toBe('en');
+
+    const [culture6, match6] = DomUtils.getCulture(cultures, 'fr-CA');
+    expect(culture6?.name).toBe('zh-Hans');
+    expect(match6).toBe(DomUtils.CultureMatch.Default);
 });
 
 test('Tests for getLocationKey', () => {

package/lib/cjs/DataTypes.d.ts

@@ -240,7 +240,7 @@ export declare namespace DataTypes {
         /**
          * Compatible names
          */
-        compatibleName?: string[];
+        compatibleNames?: string[];
     }>;
     /**
      * Dynamic interface with multiple properties

package/lib/cjs/DomUtils.d.ts

@@ -62,6 +62,15 @@ export declare namespace DomUtils {
      * @returns Object
      */
     function formDataToObject(form: IFormData): Record<string, FormDataFieldValue | FormDataFieldValue[]>;
+    /**
+     * Culture match case Enum
+     */
+    enum CultureMatch {
+        Exact = 0,
+        Compatible = 1,
+        SamePart = 2,
+        Default = 3
+    }
     /**
      * Get the available culture definition
      * @param items Available cultures
@@ -73,15 +82,15 @@ export declare namespace DomUtils {
         resources: T; /**
          * Current detected culture
          */
-        compatibleName?: string[] | undefined;
-    }>[], culture: string) => Readonly<{
+        compatibleNames?: string[] | undefined;
+    }>[], culture: string) => [Readonly<{
         name: string;
         label: string;
         resources: T; /**
          * Current detected culture
          */
-        compatibleName?: string[] | undefined;
-    }> | undefined;
+        compatibleNames?: string[] | undefined;
+    }> | undefined, CultureMatch];
     /**
      * Get input value depending on its type
      * @param input HTML input

package/lib/cjs/DomUtils.js

@@ -268,6 +268,16 @@ var DomUtils;
         return dic;
     }
     DomUtils.formDataToObject = formDataToObject;
+    /**
+     * Culture match case Enum
+     */
+    let CultureMatch;
+    (function (CultureMatch) {
+        CultureMatch[CultureMatch["Exact"] = 0] = "Exact";
+        CultureMatch[CultureMatch["Compatible"] = 1] = "Compatible";
+        CultureMatch[CultureMatch["SamePart"] = 2] = "SamePart";
+        CultureMatch[CultureMatch["Default"] = 3] = "Default";
+    })(CultureMatch = DomUtils.CultureMatch || (DomUtils.CultureMatch = {}));
     /**
      * Get the available culture definition
      * @param items Available cultures
@@ -275,23 +285,27 @@ var DomUtils;
      */
     DomUtils.getCulture = (items, culture) => {
         if (items.length === 0) {
-            return undefined;
+            return [undefined, CultureMatch.Exact];
         }
         // Exact match
         const exactMatch = items.find((item) => item.name === culture);
         if (exactMatch)
-            return exactMatch;
+            return [exactMatch, CultureMatch.Exact];
         // Compatible match
-        const compatibleMatch = items.find((item) => { var _a; return (_a = item.compatibleName) === null || _a === void 0 ? void 0 : _a.includes(culture); });
+        const compatibleMatch = items.find((item) => {
+            var _a;
+            return ((_a = item.compatibleNames) === null || _a === void 0 ? void 0 : _a.includes(culture)) ||
+                culture.startsWith(item + '-');
+        });
         if (compatibleMatch)
-            return compatibleMatch;
+            return [compatibleMatch, CultureMatch.Compatible];
         // Same part, like zh-CN and zh-HK
         const samePart = culture.split('-')[0];
         const samePartMatch = items.find((item) => item.name.startsWith(samePart));
         if (samePartMatch)
-            return samePartMatch;
+            return [samePartMatch, CultureMatch.SamePart];
         // Default
-        return items[0];
+        return [items[0], CultureMatch.Default];
     };
     /**
      * Get input value depending on its type

package/lib/mjs/DataTypes.d.ts

@@ -240,7 +240,7 @@ export declare namespace DataTypes {
         /**
          * Compatible names
          */
-        compatibleName?: string[];
+        compatibleNames?: string[];
     }>;
     /**
      * Dynamic interface with multiple properties

package/lib/mjs/DomUtils.d.ts

@@ -62,6 +62,15 @@ export declare namespace DomUtils {
      * @returns Object
      */
     function formDataToObject(form: IFormData): Record<string, FormDataFieldValue | FormDataFieldValue[]>;
+    /**
+     * Culture match case Enum
+     */
+    enum CultureMatch {
+        Exact = 0,
+        Compatible = 1,
+        SamePart = 2,
+        Default = 3
+    }
     /**
      * Get the available culture definition
      * @param items Available cultures
@@ -73,15 +82,15 @@ export declare namespace DomUtils {
         resources: T; /**
          * Current detected culture
          */
-        compatibleName?: string[] | undefined;
-    }>[], culture: string) => Readonly<{
+        compatibleNames?: string[] | undefined;
+    }>[], culture: string) => [Readonly<{
         name: string;
         label: string;
         resources: T; /**
          * Current detected culture
          */
-        compatibleName?: string[] | undefined;
-    }> | undefined;
+        compatibleNames?: string[] | undefined;
+    }> | undefined, CultureMatch];
     /**
      * Get input value depending on its type
      * @param input HTML input

package/lib/mjs/DomUtils.js

@@ -265,6 +265,16 @@ export var DomUtils;
         return dic;
     }
     DomUtils.formDataToObject = formDataToObject;
+    /**
+     * Culture match case Enum
+     */
+    let CultureMatch;
+    (function (CultureMatch) {
+        CultureMatch[CultureMatch["Exact"] = 0] = "Exact";
+        CultureMatch[CultureMatch["Compatible"] = 1] = "Compatible";
+        CultureMatch[CultureMatch["SamePart"] = 2] = "SamePart";
+        CultureMatch[CultureMatch["Default"] = 3] = "Default";
+    })(CultureMatch = DomUtils.CultureMatch || (DomUtils.CultureMatch = {}));
     /**
      * Get the available culture definition
      * @param items Available cultures
@@ -272,23 +282,27 @@ export var DomUtils;
      */
     DomUtils.getCulture = (items, culture) => {
         if (items.length === 0) {
-            return undefined;
+            return [undefined, CultureMatch.Exact];
         }
         // Exact match
         const exactMatch = items.find((item) => item.name === culture);
         if (exactMatch)
-            return exactMatch;
+            return [exactMatch, CultureMatch.Exact];
         // Compatible match
-        const compatibleMatch = items.find((item) => { var _a; return (_a = item.compatibleName) === null || _a === void 0 ? void 0 : _a.includes(culture); });
+        const compatibleMatch = items.find((item) => {
+            var _a;
+            return ((_a = item.compatibleNames) === null || _a === void 0 ? void 0 : _a.includes(culture)) ||
+                culture.startsWith(item + '-');
+        });
         if (compatibleMatch)
-            return compatibleMatch;
+            return [compatibleMatch, CultureMatch.Compatible];
         // Same part, like zh-CN and zh-HK
         const samePart = culture.split('-')[0];
         const samePartMatch = items.find((item) => item.name.startsWith(samePart));
         if (samePartMatch)
-            return samePartMatch;
+            return [samePartMatch, CultureMatch.SamePart];
         // Default
-        return items[0];
+        return [items[0], CultureMatch.Default];
     };
     /**
      * Get input value depending on its type

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.79",
+    "version": "1.1.81",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -58,7 +58,7 @@
         "@types/lodash.isequal": "^4.5.6",
         "@typescript-eslint/eslint-plugin": "^5.45.0",
         "@typescript-eslint/parser": "^5.45.0",
-        "eslint": "^8.28.0",
+        "eslint": "^8.29.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^29.3.1",

package/src/DataTypes.ts

@@ -305,7 +305,7 @@ export namespace DataTypes {
             /**
              * Compatible names
              */
-            compatibleName?: string[];
+            compatibleNames?: string[];
         }>;
 
     /**

package/src/DomUtils.ts

@@ -307,6 +307,16 @@ export namespace DomUtils {
         return dic;
     }
 
+    /**
+     * Culture match case Enum
+     */
+    export enum CultureMatch {
+        Exact,
+        Compatible,
+        SamePart,
+        Default
+    }
+
     /**
      * Get the available culture definition
      * @param items Available cultures
@@ -315,30 +325,32 @@ export namespace DomUtils {
     export const getCulture = <T extends DataTypes.StringRecord>(
         items: DataTypes.CultureDefinition<T>[],
         culture: string
-    ) => {
+    ): [DataTypes.CultureDefinition<T> | undefined, CultureMatch] => {
         if (items.length === 0) {
-            return undefined;
+            return [undefined, CultureMatch.Exact];
         }
 
         // Exact match
         const exactMatch = items.find((item) => item.name === culture);
-        if (exactMatch) return exactMatch;
+        if (exactMatch) return [exactMatch, CultureMatch.Exact];
 
         // Compatible match
-        const compatibleMatch = items.find((item) =>
-            item.compatibleName?.includes(culture)
+        const compatibleMatch = items.find(
+            (item) =>
+                item.compatibleNames?.includes(culture) ||
+                culture.startsWith(item + '-')
         );
-        if (compatibleMatch) return compatibleMatch;
+        if (compatibleMatch) return [compatibleMatch, CultureMatch.Compatible];
 
         // Same part, like zh-CN and zh-HK
         const samePart = culture.split('-')[0];
         const samePartMatch = items.find((item) =>
             item.name.startsWith(samePart)
         );
-        if (samePartMatch) return samePartMatch;
+        if (samePartMatch) return [samePartMatch, CultureMatch.SamePart];
 
         // Default
-        return items[0];
+        return [items[0], CultureMatch.Default];
     };
 
     /**