@etsoo/shared 1.1.49 → 1.1.52

package/README.md

@@ -142,6 +142,7 @@ 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|
 |substract|Date extended method, substract a date|

package/__tests__/DataTypes.ts

@@ -1,4 +1,4 @@
-import { DataTypes } from '../src/DataTypes';
+import { DataTypes, IdDefaultType, LabelDefaultType } from '../src/DataTypes';
 
 test('Tests for DI', () => {
     const item: DataTypes.DIS<'id', number> & DataTypes.DIS<'label', string> = {
@@ -132,3 +132,25 @@ test('Tests for isSimpleType', () => {
     expect(DataTypes.isSimpleType(['a', 'b', 'c'])).toBeTruthy();
     expect(DataTypes.isSimpleType({})).toBeFalsy();
 });
+
+test('Tests for IdDefaultType', () => {
+    const test = <T extends object, F extends keyof T = IdDefaultType<T>>(
+        obj: T,
+        field?: F
+    ) => {
+        const f = field ?? ('id' as F);
+        return obj[f];
+    };
+
+    type D = { label: string; name: string; id: number };
+    const data: D = {
+        label: 'label',
+        name: 'name',
+        id: 1
+    };
+    const v = test<D>(data);
+    expect(typeof v).toBe('number');
+
+    const v1 = test<D, LabelDefaultType<D>>(data, 'label');
+    expect(v1).toBe('label');
+});

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', () => {

package/lib/cjs/DataTypes.d.ts

@@ -180,7 +180,7 @@ export declare namespace DataTypes {
     /**
      * Get specific type keys
      */
-    type Keys<T, R = string | number> = {
+    type Keys<T extends object, R = string | number> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
     /**
@@ -333,3 +333,15 @@ export declare type ListType = DataTypes.IdLabelItem<number>;
  * List item with string id type
  */
 export declare type ListType1 = DataTypes.IdLabelItem<string>;
+/**
+ * Id default type
+ */
+export declare type IdDefaultType<T extends object> = T extends {
+    id: number | string;
+} ? DataTypes.Keys<T> & 'id' : DataTypes.Keys<T>;
+/**
+ * Label default type
+ */
+export declare type LabelDefaultType<T extends object> = T extends {
+    label: string;
+} ? 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

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;
     /**

package/lib/mjs/DataTypes.d.ts

@@ -180,7 +180,7 @@ export declare namespace DataTypes {
     /**
      * Get specific type keys
      */
-    type Keys<T, R = string | number> = {
+    type Keys<T extends object, R = string | number> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
     /**
@@ -333,3 +333,15 @@ export declare type ListType = DataTypes.IdLabelItem<number>;
  * List item with string id type
  */
 export declare type ListType1 = DataTypes.IdLabelItem<string>;
+/**
+ * Id default type
+ */
+export declare type IdDefaultType<T extends object> = T extends {
+    id: number | string;
+} ? DataTypes.Keys<T> & 'id' : DataTypes.Keys<T>;
+/**
+ * Label default type
+ */
+export declare type LabelDefaultType<T extends object> = T extends {
+    label: string;
+} ? 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

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;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.49",
+    "version": "1.1.52",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -53,12 +53,11 @@
         "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",
+        "@typescript-eslint/eslint-plugin": "^5.36.1",
+        "@typescript-eslint/parser": "^5.36.1",
+        "eslint": "^8.23.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^28.1.3",

package/src/DataTypes.ts

@@ -231,7 +231,7 @@ export namespace DataTypes {
     /**
      * Get specific type keys
      */
-    export type Keys<T, R = string | number> = {
+    export type Keys<T extends object, R = string | number> = {
         [k in keyof T]: T[k] extends R ? k : never;
     }[keyof T];
 
@@ -656,3 +656,17 @@ export type ListType = DataTypes.IdLabelItem<number>;
  * List item with string id type
  */
 export type ListType1 = DataTypes.IdLabelItem<string>;
+
+/**
+ * Id default type
+ */
+export type IdDefaultType<T extends object> = T extends { id: number | string }
+    ? DataTypes.Keys<T> & 'id'
+    : DataTypes.Keys<T>;
+
+/**
+ * Label default type
+ */
+export type LabelDefaultType<T extends object> = T extends { label: string }
+    ? 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(':')}`;
     }
 
     /**