@etsoo/shared 1.1.50 → 1.1.53

package/README.md

@@ -142,8 +142,11 @@ Dates related utilities
 |Methods||
 |getDays|Get month's days|
 |forma|Format dates|
+|formatForInput|Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property|
 |jsonParser|JSON parser|
 |parse|Parse string to date|
+|sameDay|Two dates are in the same day|
+|sameMonth|Two dates are in the same month|
 |substract|Date extended method, substract a date|
 
 ## DomUtils

package/__tests__/DateUtils.ts

@@ -56,8 +56,15 @@ test('Tests for formatForInput', () => {
     const result1 = DateUtils.formatForInput('2021/7/17');
     expect(result1).toBe('2021-07-17');
 
-    const result2 = DateUtils.formatForInput(new Date(2021, 5, 6));
+    const d = new Date(2021, 5, 6, 20, 18, 45);
+    const result2 = DateUtils.formatForInput(d);
     expect(result2).toBe('2021-06-06');
+
+    const result3 = DateUtils.formatForInput(d, false);
+    expect(result3).toBe('2021-06-06T20:18');
+
+    const result4 = DateUtils.formatForInput(d, true);
+    expect(result4).toBe('2021-06-06T20:18:45');
 });
 
 test('Tests for substract', () => {
@@ -69,3 +76,21 @@ test('Tests for substract', () => {
     expect(d4.substract(d1).totalYears < 2).toBeTruthy();
     expect(d2.substract(d1).totalMinutes > 10).toBeTruthy();
 });
+
+test('Tests for sameDay', () => {
+    expect(
+        DateUtils.sameDay('2022/9/11 22:03', new Date(2022, 8, 11, 10, 3))
+    ).toBeTruthy();
+    expect(
+        DateUtils.sameDay('2022/9/11 22:03', new Date(2022, 9, 11, 10, 3))
+    ).toBeFalsy();
+});
+
+test('Tests for sameMonth', () => {
+    expect(
+        DateUtils.sameMonth('2022-09-11 22:03', new Date(2022, 8, 10, 10, 3))
+    ).toBeTruthy();
+    expect(
+        DateUtils.sameMonth('2022/9/11 22:03', '2022/8/31 23:59:59')
+    ).toBeFalsy();
+});

package/lib/cjs/DataTypes.d.ts

@@ -344,4 +344,4 @@ export declare type IdDefaultType<T extends object> = T extends {
  */
 export declare type LabelDefaultType<T extends object> = T extends {
     label: string;
-} ? DataTypes.Keys<T> & 'label' : DataTypes.Keys<T>;
+} ? DataTypes.Keys<T, string> & 'label' : DataTypes.Keys<T, string>;

package/lib/cjs/DateUtils.d.ts

@@ -45,10 +45,11 @@ export declare namespace DateUtils {
      */
     function format(input?: Date | string, locale?: string | string[], options?: FormatOptions, timeZone?: string): string | undefined;
     /**
-     * Format to 'yyyy-MM-dd', especially used for date input min/max property
+     * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
+     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
      */
-    function formatForInput(date?: Date | string | null): string;
+    function formatForInput(date?: Date | string | null, hasSecond?: boolean): string;
     /**
      * Get month's days
      * @param year Year
@@ -69,4 +70,18 @@ export declare namespace DateUtils {
      * @returns Date
      */
     function parse(input?: Date | string | null): Date | undefined;
+    /**
+     * Two dates are in the same day
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    function sameDay(d1?: Date | string | null, d2?: Date | string | null): boolean;
+    /**
+     * Two dates are in the same month
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    function sameMonth(d1?: Date | string | null, d2?: Date | string | null): boolean;
 }

package/lib/cjs/DateUtils.js

@@ -92,10 +92,11 @@ var DateUtils;
     }
     DateUtils.format = format;
     /**
-     * Format to 'yyyy-MM-dd', especially used for date input min/max property
+     * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
+     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
      */
-    function formatForInput(date) {
+    function formatForInput(date, hasSecond) {
         // Parse string as date
         if (typeof date === 'string')
             date = new Date(date);
@@ -107,8 +108,14 @@ var DateUtils;
             (date.getMonth() + 1).toString().padStart(2, '0'),
             date.getDate().toString().padStart(2, '0')
         ];
-        // Return
-        return parts.join('-');
+        // Date
+        const d = parts.join('-');
+        if (hasSecond == null)
+            return d;
+        const hm = [date.getHours(), date.getMinutes()];
+        if (hasSecond)
+            hm.push(date.getSeconds());
+        return `${d}T${hm.join(':')}`;
     }
     DateUtils.formatForInput = formatForInput;
     /**
@@ -157,4 +164,33 @@ var DateUtils;
         return input;
     }
     DateUtils.parse = parse;
+    /**
+     * Two dates are in the same day
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    function sameDay(d1, d2) {
+        d1 = parse(d1);
+        d2 = parse(d2);
+        if (d1 == null || d2 == null)
+            return false;
+        return d1.toDateString() === d2.toDateString();
+    }
+    DateUtils.sameDay = sameDay;
+    /**
+     * Two dates are in the same month
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    function sameMonth(d1, d2) {
+        d1 = parse(d1);
+        d2 = parse(d2);
+        if (d1 == null || d2 == null)
+            return false;
+        return (d1.getFullYear() === d2.getFullYear() &&
+            d1.getMonth() === d2.getMonth());
+    }
+    DateUtils.sameMonth = sameMonth;
 })(DateUtils = exports.DateUtils || (exports.DateUtils = {}));

package/lib/mjs/DataTypes.d.ts

@@ -344,4 +344,4 @@ export declare type IdDefaultType<T extends object> = T extends {
  */
 export declare type LabelDefaultType<T extends object> = T extends {
     label: string;
-} ? DataTypes.Keys<T> & 'label' : DataTypes.Keys<T>;
+} ? DataTypes.Keys<T, string> & 'label' : DataTypes.Keys<T, string>;

package/lib/mjs/DateUtils.d.ts

@@ -45,10 +45,11 @@ export declare namespace DateUtils {
      */
     function format(input?: Date | string, locale?: string | string[], options?: FormatOptions, timeZone?: string): string | undefined;
     /**
-     * Format to 'yyyy-MM-dd', especially used for date input min/max property
+     * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
+     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
      */
-    function formatForInput(date?: Date | string | null): string;
+    function formatForInput(date?: Date | string | null, hasSecond?: boolean): string;
     /**
      * Get month's days
      * @param year Year
@@ -69,4 +70,18 @@ export declare namespace DateUtils {
      * @returns Date
      */
     function parse(input?: Date | string | null): Date | undefined;
+    /**
+     * Two dates are in the same day
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    function sameDay(d1?: Date | string | null, d2?: Date | string | null): boolean;
+    /**
+     * Two dates are in the same month
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    function sameMonth(d1?: Date | string | null, d2?: Date | string | null): boolean;
 }

package/lib/mjs/DateUtils.js

@@ -89,10 +89,11 @@ export var DateUtils;
     }
     DateUtils.format = format;
     /**
-     * Format to 'yyyy-MM-dd', especially used for date input min/max property
+     * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
+     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
      */
-    function formatForInput(date) {
+    function formatForInput(date, hasSecond) {
         // Parse string as date
         if (typeof date === 'string')
             date = new Date(date);
@@ -104,8 +105,14 @@ export var DateUtils;
             (date.getMonth() + 1).toString().padStart(2, '0'),
             date.getDate().toString().padStart(2, '0')
         ];
-        // Return
-        return parts.join('-');
+        // Date
+        const d = parts.join('-');
+        if (hasSecond == null)
+            return d;
+        const hm = [date.getHours(), date.getMinutes()];
+        if (hasSecond)
+            hm.push(date.getSeconds());
+        return `${d}T${hm.join(':')}`;
     }
     DateUtils.formatForInput = formatForInput;
     /**
@@ -154,4 +161,33 @@ export var DateUtils;
         return input;
     }
     DateUtils.parse = parse;
+    /**
+     * Two dates are in the same day
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    function sameDay(d1, d2) {
+        d1 = parse(d1);
+        d2 = parse(d2);
+        if (d1 == null || d2 == null)
+            return false;
+        return d1.toDateString() === d2.toDateString();
+    }
+    DateUtils.sameDay = sameDay;
+    /**
+     * Two dates are in the same month
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    function sameMonth(d1, d2) {
+        d1 = parse(d1);
+        d2 = parse(d2);
+        if (d1 == null || d2 == null)
+            return false;
+        return (d1.getFullYear() === d2.getFullYear() &&
+            d1.getMonth() === d2.getMonth());
+    }
+    DateUtils.sameMonth = sameMonth;
 })(DateUtils || (DateUtils = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.50",
+    "version": "1.1.53",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -53,17 +53,16 @@
         "url": "https://github.com/ETSOO/Shared/issues"
     },
     "homepage": "https://github.com/ETSOO/Shared#readme",
-    "dependencies": {},
     "devDependencies": {
-        "@types/jest": "^28.1.8",
-        "@typescript-eslint/eslint-plugin": "^5.35.1",
-        "@typescript-eslint/parser": "^5.35.1",
-        "eslint": "^8.22.0",
+        "@types/jest": "^29.0.0",
+        "@typescript-eslint/eslint-plugin": "^5.36.2",
+        "@typescript-eslint/parser": "^5.36.2",
+        "eslint": "^8.23.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
-        "jest": "^28.1.3",
-        "jest-environment-jsdom": "^28.1.3",
-        "ts-jest": "^28.0.8",
-        "typescript": "^4.8.2"
+        "jest": "^29.0.3",
+        "jest-environment-jsdom": "^29.0.3",
+        "ts-jest": "^29.0.0",
+        "typescript": "^4.8.3"
     }
 }

package/src/DataTypes.ts

@@ -668,5 +668,5 @@ export type IdDefaultType<T extends object> = T extends { id: number | string }
  * Label default type
  */
 export type LabelDefaultType<T extends object> = T extends { label: string }
-    ? DataTypes.Keys<T> & 'label'
-    : DataTypes.Keys<T>;
+    ? DataTypes.Keys<T, string> & 'label'
+    : DataTypes.Keys<T, string>;

package/src/DateUtils.ts

@@ -145,10 +145,14 @@ export namespace DateUtils {
     }
 
     /**
-     * Format to 'yyyy-MM-dd', especially used for date input min/max property
+     * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
      * @param date Input date
+     * @param hasSecond 'undefined' for date only, 'false' for hour:minute only
      */
-    export function formatForInput(date?: Date | string | null) {
+    export function formatForInput(
+        date?: Date | string | null,
+        hasSecond?: boolean
+    ) {
         // Parse string as date
         if (typeof date === 'string') date = new Date(date);
 
@@ -162,8 +166,13 @@ export namespace DateUtils {
             date.getDate().toString().padStart(2, '0')
         ];
 
-        // Return
-        return parts.join('-');
+        // Date
+        const d = parts.join('-');
+        if (hasSecond == null) return d;
+
+        const hm = [date.getHours(), date.getMinutes()];
+        if (hasSecond) hm.push(date.getSeconds());
+        return `${d}T${hm.join(':')}`;
     }
 
     /**
@@ -213,4 +222,39 @@ export namespace DateUtils {
         }
         return input;
     }
+
+    /**
+     * Two dates are in the same day
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    export function sameDay(
+        d1?: Date | string | null,
+        d2?: Date | string | null
+    ) {
+        d1 = parse(d1);
+        d2 = parse(d2);
+        if (d1 == null || d2 == null) return false;
+        return d1.toDateString() === d2.toDateString();
+    }
+
+    /**
+     * Two dates are in the same month
+     * @param d1 First date
+     * @param d2 Second date
+     * @returns Result
+     */
+    export function sameMonth(
+        d1?: Date | string | null,
+        d2?: Date | string | null
+    ) {
+        d1 = parse(d1);
+        d2 = parse(d2);
+        if (d1 == null || d2 == null) return false;
+        return (
+            d1.getFullYear() === d2.getFullYear() &&
+            d1.getMonth() === d2.getMonth()
+        );
+    }
 }