@etsoo/shared 1.1.99 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/__tests__/DataTypes.ts +1 -1
  2. package/lib/cjs/DataTypes.d.ts +1 -1
  3. package/lib/cjs/DataTypes.js +1 -1
  4. package/lib/cjs/DateUtils.d.ts +6 -3
  5. package/lib/cjs/DateUtils.js +7 -8
  6. package/lib/mjs/DataTypes.d.ts +1 -1
  7. package/lib/mjs/DataTypes.js +1 -1
  8. package/lib/mjs/DateUtils.d.ts +6 -3
  9. package/lib/mjs/DateUtils.js +7 -8
  10. package/package.json +2 -2
  11. package/src/DataTypes.ts +2 -5
  12. package/src/DateUtils.ts +24 -19
package/__tests__/DataTypes.ts CHANGED
@@ -80,7 +80,7 @@ test('Tests for getEnumByValue', () => {
80
80
  test('Tests for getEnumKey', () => {
81
81
  expect(
82
82
  DataTypes.getEnumKey(DataTypes.HAlignEnum, DataTypes.HAlignEnum.Center)
83
- ).toBe('center');
83
+ ).toBe('Center');
84
84
  });
85
85
 
86
86
  test('Tests for getEnumKeys', () => {
package/lib/cjs/DataTypes.d.ts CHANGED
@@ -327,7 +327,7 @@ export declare namespace DataTypes {
327
327
  * @param value Value
328
328
  * @returns Result
329
329
  */
330
- function getEnumKey<T extends string>(enumItem: EnumBase, value: EnumValue): T;
330
+ function getEnumKey(enumItem: EnumBase, value: EnumValue): string;
331
331
  /**
332
332
  * Get Enum keys
333
333
  * @param input Input Enum
package/lib/cjs/DataTypes.js CHANGED
@@ -294,7 +294,7 @@ var DataTypes;
294
294
  * @returns Result
295
295
  */
296
296
  function getEnumKey(enumItem, value) {
297
- return enumItem[value].toString().toLowerCase();
297
+ return enumItem[value].toString();
298
298
  }
299
299
  DataTypes.getEnumKey = getEnumKey;
300
300
  /**
package/lib/cjs/DateUtils.d.ts CHANGED
@@ -19,6 +19,8 @@ export interface TimeSpan {
19
19
  totalMonths: number;
20
20
  totalYears: number;
21
21
  }
22
+ type DateType = Date | string | null | undefined;
23
+ type DateReturn<T extends DateType, R> = T extends Date ? R : R | undefined;
22
24
  export declare namespace DateUtils {
23
25
  /**
24
26
  * Day format, YYYY-MM-DD
@@ -43,13 +45,13 @@ export declare namespace DateUtils {
43
45
  * @param options Options
44
46
  * @param timeZone Time zone
45
47
  */
46
- function format(input?: Date | string, locale?: string | string[], options?: FormatOptions, timeZone?: string): string | undefined;
48
+ function format<T extends DateType>(input: T, locale?: string | string[], options?: FormatOptions, timeZone?: string): DateReturn<T, string>;
47
49
  /**
48
50
  * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
49
51
  * @param date Input date
50
52
  * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
51
53
  */
52
- function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string | undefined;
54
+ function formatForInput<T extends DateType>(date: T, hasSecondOrType?: boolean | string): DateReturn<T, string>;
53
55
  /**
54
56
  * Get month's days
55
57
  * @param year Year
@@ -75,7 +77,7 @@ export declare namespace DateUtils {
75
77
  * @param input Input string
76
78
  * @returns Date
77
79
  */
78
- function parse(input?: Date | string | null): Date | undefined;
80
+ function parse<T extends DateType>(input: T): DateReturn<T, Date>;
79
81
  /**
80
82
  * Two dates are in the same day
81
83
  * @param d1 First date
@@ -91,3 +93,4 @@ export declare namespace DateUtils {
91
93
  */
92
94
  function sameMonth(d1?: Date | string | null, d2?: Date | string | null): boolean;
93
95
  }
96
+ export {};
package/lib/cjs/DateUtils.js CHANGED
@@ -101,8 +101,7 @@ var DateUtils;
101
101
  if (date == null || date === '')
102
102
  return undefined;
103
103
  // Parse string as date
104
- if (typeof date === 'string')
105
- date = new Date(date);
104
+ const dt = typeof date === 'string' ? new Date(date) : date;
106
105
  const hasSecond = typeof hasSecondOrType === 'string'
107
106
  ? hasSecondOrType === 'date'
108
107
  ? undefined
@@ -110,20 +109,20 @@ var DateUtils;
110
109
  : hasSecondOrType;
111
110
  // Parts
112
111
  const parts = [
113
- date.getFullYear(),
114
- (date.getMonth() + 1).toString().padStart(2, '0'),
115
- date.getDate().toString().padStart(2, '0')
112
+ dt.getFullYear(),
113
+ (dt.getMonth() + 1).toString().padStart(2, '0'),
114
+ dt.getDate().toString().padStart(2, '0')
116
115
  ];
117
116
  // Date
118
117
  const d = parts.join('-');
119
118
  if (hasSecond == null)
120
119
  return d;
121
120
  const hm = [
122
- date.getHours().toString().padStart(2, '0'),
123
- date.getMinutes().toString().padStart(2, '0')
121
+ dt.getHours().toString().padStart(2, '0'),
122
+ dt.getMinutes().toString().padStart(2, '0')
124
123
  ];
125
124
  if (hasSecond)
126
- hm.push(date.getSeconds().toString().padStart(2, '0'));
125
+ hm.push(dt.getSeconds().toString().padStart(2, '0'));
127
126
  return `${d}T${hm.join(':')}`;
128
127
  }
129
128
  DateUtils.formatForInput = formatForInput;
package/lib/mjs/DataTypes.d.ts CHANGED
@@ -327,7 +327,7 @@ export declare namespace DataTypes {
327
327
  * @param value Value
328
328
  * @returns Result
329
329
  */
330
- function getEnumKey<T extends string>(enumItem: EnumBase, value: EnumValue): T;
330
+ function getEnumKey(enumItem: EnumBase, value: EnumValue): string;
331
331
  /**
332
332
  * Get Enum keys
333
333
  * @param input Input Enum
package/lib/mjs/DataTypes.js CHANGED
@@ -291,7 +291,7 @@ export var DataTypes;
291
291
  * @returns Result
292
292
  */
293
293
  function getEnumKey(enumItem, value) {
294
- return enumItem[value].toString().toLowerCase();
294
+ return enumItem[value].toString();
295
295
  }
296
296
  DataTypes.getEnumKey = getEnumKey;
297
297
  /**
package/lib/mjs/DateUtils.d.ts CHANGED
@@ -19,6 +19,8 @@ export interface TimeSpan {
19
19
  totalMonths: number;
20
20
  totalYears: number;
21
21
  }
22
+ type DateType = Date | string | null | undefined;
23
+ type DateReturn<T extends DateType, R> = T extends Date ? R : R | undefined;
22
24
  export declare namespace DateUtils {
23
25
  /**
24
26
  * Day format, YYYY-MM-DD
@@ -43,13 +45,13 @@ export declare namespace DateUtils {
43
45
  * @param options Options
44
46
  * @param timeZone Time zone
45
47
  */
46
- function format(input?: Date | string, locale?: string | string[], options?: FormatOptions, timeZone?: string): string | undefined;
48
+ function format<T extends DateType>(input: T, locale?: string | string[], options?: FormatOptions, timeZone?: string): DateReturn<T, string>;
47
49
  /**
48
50
  * Format to 'yyyy-MM-dd' or 'yyyy-MM-ddThh:mm:ss, especially used for date input min/max property
49
51
  * @param date Input date
50
52
  * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
51
53
  */
52
- function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string | undefined;
54
+ function formatForInput<T extends DateType>(date: T, hasSecondOrType?: boolean | string): DateReturn<T, string>;
53
55
  /**
54
56
  * Get month's days
55
57
  * @param year Year
@@ -75,7 +77,7 @@ export declare namespace DateUtils {
75
77
  * @param input Input string
76
78
  * @returns Date
77
79
  */
78
- function parse(input?: Date | string | null): Date | undefined;
80
+ function parse<T extends DateType>(input: T): DateReturn<T, Date>;
79
81
  /**
80
82
  * Two dates are in the same day
81
83
  * @param d1 First date
@@ -91,3 +93,4 @@ export declare namespace DateUtils {
91
93
  */
92
94
  function sameMonth(d1?: Date | string | null, d2?: Date | string | null): boolean;
93
95
  }
96
+ export {};
package/lib/mjs/DateUtils.js CHANGED
@@ -98,8 +98,7 @@ export var DateUtils;
98
98
  if (date == null || date === '')
99
99
  return undefined;
100
100
  // Parse string as date
101
- if (typeof date === 'string')
102
- date = new Date(date);
101
+ const dt = typeof date === 'string' ? new Date(date) : date;
103
102
  const hasSecond = typeof hasSecondOrType === 'string'
104
103
  ? hasSecondOrType === 'date'
105
104
  ? undefined
@@ -107,20 +106,20 @@ export var DateUtils;
107
106
  : hasSecondOrType;
108
107
  // Parts
109
108
  const parts = [
110
- date.getFullYear(),
111
- (date.getMonth() + 1).toString().padStart(2, '0'),
112
- date.getDate().toString().padStart(2, '0')
109
+ dt.getFullYear(),
110
+ (dt.getMonth() + 1).toString().padStart(2, '0'),
111
+ dt.getDate().toString().padStart(2, '0')
113
112
  ];
114
113
  // Date
115
114
  const d = parts.join('-');
116
115
  if (hasSecond == null)
117
116
  return d;
118
117
  const hm = [
119
- date.getHours().toString().padStart(2, '0'),
120
- date.getMinutes().toString().padStart(2, '0')
118
+ dt.getHours().toString().padStart(2, '0'),
119
+ dt.getMinutes().toString().padStart(2, '0')
121
120
  ];
122
121
  if (hasSecond)
123
- hm.push(date.getSeconds().toString().padStart(2, '0'));
122
+ hm.push(dt.getSeconds().toString().padStart(2, '0'));
124
123
  return `${d}T${hm.join(':')}`;
125
124
  }
126
125
  DateUtils.formatForInput = formatForInput;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@etsoo/shared",
3
- "version": "1.1.99",
3
+ "version": "1.2.1",
4
4
  "description": "TypeScript shared utilities and functions",
5
5
  "main": "lib/cjs/index.js",
6
6
  "module": "lib/mjs/index.js",
@@ -59,7 +59,7 @@
59
59
  "jest": "^29.5.0",
60
60
  "jest-environment-jsdom": "^29.5.0",
61
61
  "ts-jest": "^29.1.0",
62
- "typescript": "^5.0.3"
62
+ "typescript": "^5.0.4"
63
63
  },
64
64
  "dependencies": {
65
65
  "lodash.isequal": "^4.5.0"
package/src/DataTypes.ts CHANGED
@@ -578,11 +578,8 @@ export namespace DataTypes {
578
578
  * @param value Value
579
579
  * @returns Result
580
580
  */
581
- export function getEnumKey<T extends string>(
582
- enumItem: EnumBase,
583
- value: EnumValue
584
- ) {
585
- return <T>enumItem[value].toString().toLowerCase();
581
+ export function getEnumKey(enumItem: EnumBase, value: EnumValue) {
582
+ return enumItem[value].toString();
586
583
  }
587
584
 
588
585
  /**
package/src/DateUtils.ts CHANGED
@@ -63,6 +63,10 @@ export interface TimeSpan {
63
63
  totalYears: number;
64
64
  }
65
65
 
66
+ type DateType = Date | string | null | undefined;
67
+
68
+ type DateReturn<T extends DateType, R> = T extends Date ? R : R | undefined;
69
+
66
70
  export namespace DateUtils {
67
71
  /**
68
72
  * Day format, YYYY-MM-DD
@@ -103,17 +107,17 @@ export namespace DateUtils {
103
107
  * @param options Options
104
108
  * @param timeZone Time zone
105
109
  */
106
- export function format(
107
- input?: Date | string,
110
+ export function format<T extends DateType>(
111
+ input: T,
108
112
  locale?: string | string[],
109
113
  options?: FormatOptions,
110
114
  timeZone?: string
111
- ) {
115
+ ): DateReturn<T, string> {
112
116
  // Parse
113
117
  const parsed = parse(input);
114
118
 
115
119
  // Null case
116
- if (parsed == null) return undefined;
120
+ if (parsed == null) return <DateReturn<T, string>>undefined;
117
121
 
118
122
  // Default options
119
123
  options ??= DayFormat;
@@ -149,15 +153,16 @@ export namespace DateUtils {
149
153
  * @param date Input date
150
154
  * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
151
155
  */
152
- export function formatForInput(
153
- date?: Date | string | null,
156
+ export function formatForInput<T extends DateType>(
157
+ date: T,
154
158
  hasSecondOrType?: boolean | string
155
- ) {
159
+ ): DateReturn<T, string> {
156
160
  // Return when null
157
- if (date == null || date === '') return undefined;
161
+ if (date == null || date === '')
162
+ return <DateReturn<T, string>>undefined;
158
163
 
159
164
  // Parse string as date
160
- if (typeof date === 'string') date = new Date(date);
165
+ const dt: Date = typeof date === 'string' ? new Date(date) : date;
161
166
 
162
167
  const hasSecond =
163
168
  typeof hasSecondOrType === 'string'
@@ -168,9 +173,9 @@ export namespace DateUtils {
168
173
 
169
174
  // Parts
170
175
  const parts = [
171
- date.getFullYear(),
172
- (date.getMonth() + 1).toString().padStart(2, '0'),
173
- date.getDate().toString().padStart(2, '0')
176
+ dt.getFullYear(),
177
+ (dt.getMonth() + 1).toString().padStart(2, '0'),
178
+ dt.getDate().toString().padStart(2, '0')
174
179
  ];
175
180
 
176
181
  // Date
@@ -178,10 +183,10 @@ export namespace DateUtils {
178
183
  if (hasSecond == null) return d;
179
184
 
180
185
  const hm = [
181
- date.getHours().toString().padStart(2, '0'),
182
- date.getMinutes().toString().padStart(2, '0')
186
+ dt.getHours().toString().padStart(2, '0'),
187
+ dt.getMinutes().toString().padStart(2, '0')
183
188
  ];
184
- if (hasSecond) hm.push(date.getSeconds().toString().padStart(2, '0'));
189
+ if (hasSecond) hm.push(dt.getSeconds().toString().padStart(2, '0'));
185
190
  return `${d}T${hm.join(':')}`;
186
191
  }
187
192
 
@@ -235,17 +240,17 @@ export namespace DateUtils {
235
240
  * @param input Input string
236
241
  * @returns Date
237
242
  */
238
- export function parse(input?: Date | string | null) {
239
- if (input == null) return undefined;
243
+ export function parse<T extends DateType>(input: T): DateReturn<T, Date> {
244
+ if (input == null) return <DateReturn<T, Date>>undefined;
240
245
  if (typeof input === 'string') {
241
246
  const f = input[0];
242
247
  if (f >= '0' && f <= '9' && /[-\/\s]/g.test(input)) {
243
248
  const n = Date.parse(input);
244
249
  if (!isNaN(n)) return new Date(n);
245
250
  }
246
- return undefined;
251
+ return <DateReturn<T, Date>>undefined;
247
252
  }
248
- return input;
253
+ return <Date>input;
249
254
  }
250
255
 
251
256
  /**