@etsoo/shared 1.1.78 → 1.1.80

package/__tests__/DateUtils.ts

@@ -73,6 +73,12 @@ test('Tests for formatForInput', () => {
     expect(result41).toBe('2021-06-06T20:08:45');
 });
 
+test('Tests for isExpired', () => {
+    expect(DateUtils.isExpired(null)).toBeFalsy();
+    expect(DateUtils.isExpired('2020/1/1')).toBeTruthy();
+    expect(DateUtils.isExpired('9999/1/1')).toBeFalsy();
+});
+
 test('Tests for substract', () => {
     const d1 = new Date('2021/1/13 12:00:00');
     const d2 = new Date('2022/1/13 12:00:00');

package/__tests__/DomUtils.ts

@@ -221,17 +221,19 @@ 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');
+    expect(DomUtils.getCulture(cultures, 'zh-CN')?.name).toBe('zh-Hans');
+    expect(DomUtils.getCulture(cultures, 'zh-Hans-CN')?.name).toBe('zh-Hans');
+    expect(DomUtils.getCulture(cultures, 'zh-Hans-HK')?.name).toBe('zh-Hans');
+    expect(DomUtils.getCulture(cultures, 'zh-SG')?.name).toBe('zh-Hans');
+    expect(DomUtils.getCulture(cultures, 'en-GB')?.name).toBe('en');
 });
 
 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/DateUtils.d.ts

@@ -57,6 +57,12 @@ export declare namespace DateUtils {
      * @returns Days
      */
     const getDays: (year: number, month: number) => number;
+    /**
+     * Is the test date expired to now
+     * @param testDate Test date
+     * @returns Result
+     */
+    function isExpired(testDate?: Date | string | null): boolean;
     /**
      * Build JSON parser
      * @param keys Date field names

package/lib/cjs/DateUtils.js

@@ -133,6 +133,21 @@ var DateUtils;
      * @returns Days
      */
     DateUtils.getDays = (year, month) => new Date(year, month + 1, 0).getDate();
+    /**
+     * Is the test date expired to now
+     * @param testDate Test date
+     * @returns Result
+     */
+    function isExpired(testDate) {
+        if (testDate == null)
+            return false;
+        const d = parse(testDate);
+        // Format error
+        if (d == null)
+            return false;
+        return d.valueOf() < new Date().valueOf();
+    }
+    DateUtils.isExpired = isExpired;
     /**
      * Build JSON parser
      * @param keys Date field names

package/lib/cjs/DomUtils.d.ts

@@ -73,14 +73,14 @@ export declare namespace DomUtils {
         resources: T; /**
          * Current detected culture
          */
-        compatibleName?: string[] | undefined;
+        compatibleNames?: string[] | undefined;
     }>[], culture: string) => Readonly<{
         name: string;
         label: string;
         resources: T; /**
          * Current detected culture
          */
-        compatibleName?: string[] | undefined;
+        compatibleNames?: string[] | undefined;
     }> | undefined;
     /**
      * Get input value depending on its type

package/lib/cjs/DomUtils.js

@@ -282,7 +282,11 @@ var DomUtils;
         if (exactMatch)
             return exactMatch;
         // 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;
         // Same part, like zh-CN and zh-HK

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/DateUtils.d.ts

@@ -57,6 +57,12 @@ export declare namespace DateUtils {
      * @returns Days
      */
     const getDays: (year: number, month: number) => number;
+    /**
+     * Is the test date expired to now
+     * @param testDate Test date
+     * @returns Result
+     */
+    function isExpired(testDate?: Date | string | null): boolean;
     /**
      * Build JSON parser
      * @param keys Date field names

package/lib/mjs/DateUtils.js

@@ -130,6 +130,21 @@ export var DateUtils;
      * @returns Days
      */
     DateUtils.getDays = (year, month) => new Date(year, month + 1, 0).getDate();
+    /**
+     * Is the test date expired to now
+     * @param testDate Test date
+     * @returns Result
+     */
+    function isExpired(testDate) {
+        if (testDate == null)
+            return false;
+        const d = parse(testDate);
+        // Format error
+        if (d == null)
+            return false;
+        return d.valueOf() < new Date().valueOf();
+    }
+    DateUtils.isExpired = isExpired;
     /**
      * Build JSON parser
      * @param keys Date field names

package/lib/mjs/DomUtils.d.ts

@@ -73,14 +73,14 @@ export declare namespace DomUtils {
         resources: T; /**
          * Current detected culture
          */
-        compatibleName?: string[] | undefined;
+        compatibleNames?: string[] | undefined;
     }>[], culture: string) => Readonly<{
         name: string;
         label: string;
         resources: T; /**
          * Current detected culture
          */
-        compatibleName?: string[] | undefined;
+        compatibleNames?: string[] | undefined;
     }> | undefined;
     /**
      * Get input value depending on its type

package/lib/mjs/DomUtils.js

@@ -279,7 +279,11 @@ export var DomUtils;
         if (exactMatch)
             return exactMatch;
         // 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;
         // Same part, like zh-CN and zh-HK

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.78",
+    "version": "1.1.80",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -56,9 +56,9 @@
     "devDependencies": {
         "@types/jest": "^29.2.3",
         "@types/lodash.isequal": "^4.5.6",
-        "@typescript-eslint/eslint-plugin": "^5.43.0",
-        "@typescript-eslint/parser": "^5.43.0",
-        "eslint": "^8.27.0",
+        "@typescript-eslint/eslint-plugin": "^5.45.0",
+        "@typescript-eslint/parser": "^5.45.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/DateUtils.ts

@@ -194,6 +194,21 @@ export namespace DateUtils {
     export const getDays = (year: number, month: number) =>
         new Date(year, month + 1, 0).getDate();
 
+    /**
+     * Is the test date expired to now
+     * @param testDate Test date
+     * @returns Result
+     */
+    export function isExpired(testDate?: Date | string | null) {
+        if (testDate == null) return false;
+        const d = parse(testDate);
+
+        // Format error
+        if (d == null) return false;
+
+        return d.valueOf() < new Date().valueOf();
+    }
+
     /**
      * Build JSON parser
      * @param keys Date field names

package/src/DomUtils.ts

@@ -325,8 +325,10 @@ export namespace DomUtils {
         if (exactMatch) return exactMatch;
 
         // 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;