@etsoo/shared 1.1.74 → 1.1.76

package/__tests__/DateUtils.ts

@@ -63,8 +63,14 @@ test('Tests for formatForInput', () => {
     const result3 = DateUtils.formatForInput(d, false);
     expect(result3).toBe('2021-06-06T20:08');
 
+    const result31 = DateUtils.formatForInput(d, 'date');
+    expect(result31).toBe('2021-06-06');
+
     const result4 = DateUtils.formatForInput(d, true);
     expect(result4).toBe('2021-06-06T20:08:45');
+
+    const result41 = DateUtils.formatForInput(d, 'datetime-local');
+    expect(result41).toBe('2021-06-06T20:08:45');
 });
 
 test('Tests for substract', () => {

package/lib/cjs/DateUtils.d.ts

@@ -47,9 +47,9 @@ export declare namespace DateUtils {
     /**
      * 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
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date?: Date | string | null, hasSecond?: boolean): string;
+    function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string;
     /**
      * Get month's days
      * @param year Year

package/lib/cjs/DateUtils.js

@@ -94,14 +94,19 @@ var DateUtils;
     /**
      * 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
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date, hasSecond) {
+    function formatForInput(date, hasSecondOrType) {
         // Parse string as date
         if (typeof date === 'string')
             date = new Date(date);
         // Default is now
         date !== null && date !== void 0 ? date : (date = new Date());
+        const hasSecond = typeof hasSecondOrType === 'string'
+            ? hasSecondOrType === 'date'
+                ? undefined
+                : true
+            : hasSecondOrType;
         // Parts
         const parts = [
             date.getFullYear(),

package/lib/cjs/NumberUtils.d.ts

@@ -8,29 +8,15 @@ declare global {
     }
 }
 export declare namespace NumberUtils {
-    /**
-     * Format number
-     * @param input Input
-     * @param locale Locale
-     * @param options Options
-     * @returns Result
-     */
-    function format(input?: number | bigint, locale?: string | string[], options?: Intl.NumberFormatOptions): string | undefined;
-    /**
-     * Format money
-     * @param input Input
-     * @param currency Currency, like USD for US dollar
-     * @param locale Locale
-     * @param isInteger Is integer value
-     * @param options Options
-     * @returns Result
-     */
-    function formatMoney(input?: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string | undefined;
+    function format(input: undefined | null, locale?: string | string[], options?: Intl.NumberFormatOptions): undefined;
+    function format(input: number | bigint, locale?: string | string[], options?: Intl.NumberFormatOptions): string;
+    function formatMoney(input: undefined | null, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): undefined;
+    function formatMoney(input: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string;
     /**
      * Parse float value
      * @param rawData Raw data
      */
-    const parse: (rawData: string | number | undefined | object) => number;
+    const parse: (rawData: unknown) => number;
     /**
      * Parse float value and unit
      * @param input Input string

package/lib/cjs/NumberUtils.js

@@ -37,6 +37,8 @@ var NumberUtils;
      */
     function formatMoney(input, currency, locale, isInteger = false, options = {}) {
         var _a, _b, _c, _d;
+        if (input == null)
+            return format(input, locale, options);
         if (currency) {
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = 'currency';

package/lib/mjs/DateUtils.d.ts

@@ -47,9 +47,9 @@ export declare namespace DateUtils {
     /**
      * 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
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date?: Date | string | null, hasSecond?: boolean): string;
+    function formatForInput(date?: Date | string | null, hasSecondOrType?: boolean | string): string;
     /**
      * Get month's days
      * @param year Year

package/lib/mjs/DateUtils.js

@@ -91,14 +91,19 @@ export var DateUtils;
     /**
      * 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
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
-    function formatForInput(date, hasSecond) {
+    function formatForInput(date, hasSecondOrType) {
         // Parse string as date
         if (typeof date === 'string')
             date = new Date(date);
         // Default is now
         date !== null && date !== void 0 ? date : (date = new Date());
+        const hasSecond = typeof hasSecondOrType === 'string'
+            ? hasSecondOrType === 'date'
+                ? undefined
+                : true
+            : hasSecondOrType;
         // Parts
         const parts = [
             date.getFullYear(),

package/lib/mjs/NumberUtils.d.ts

@@ -8,29 +8,15 @@ declare global {
     }
 }
 export declare namespace NumberUtils {
-    /**
-     * Format number
-     * @param input Input
-     * @param locale Locale
-     * @param options Options
-     * @returns Result
-     */
-    function format(input?: number | bigint, locale?: string | string[], options?: Intl.NumberFormatOptions): string | undefined;
-    /**
-     * Format money
-     * @param input Input
-     * @param currency Currency, like USD for US dollar
-     * @param locale Locale
-     * @param isInteger Is integer value
-     * @param options Options
-     * @returns Result
-     */
-    function formatMoney(input?: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string | undefined;
+    function format(input: undefined | null, locale?: string | string[], options?: Intl.NumberFormatOptions): undefined;
+    function format(input: number | bigint, locale?: string | string[], options?: Intl.NumberFormatOptions): string;
+    function formatMoney(input: undefined | null, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): undefined;
+    function formatMoney(input: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string;
     /**
      * Parse float value
      * @param rawData Raw data
      */
-    const parse: (rawData: string | number | undefined | object) => number;
+    const parse: (rawData: unknown) => number;
     /**
      * Parse float value and unit
      * @param input Input string

package/lib/mjs/NumberUtils.js

@@ -34,6 +34,8 @@ export var NumberUtils;
      */
     function formatMoney(input, currency, locale, isInteger = false, options = {}) {
         var _a, _b, _c, _d;
+        if (input == null)
+            return format(input, locale, options);
         if (currency) {
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = 'currency';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.74",
+    "version": "1.1.76",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/DateUtils.ts

@@ -147,11 +147,11 @@ export namespace DateUtils {
     /**
      * 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
+     * @param hasSecondOrType 'undefined' for date only, 'false' for hour:minute only, 'true' for all, or input field type
      */
     export function formatForInput(
         date?: Date | string | null,
-        hasSecond?: boolean
+        hasSecondOrType?: boolean | string
     ) {
         // Parse string as date
         if (typeof date === 'string') date = new Date(date);
@@ -159,6 +159,13 @@ export namespace DateUtils {
         // Default is now
         date ??= new Date();
 
+        const hasSecond =
+            typeof hasSecondOrType === 'string'
+                ? hasSecondOrType === 'date'
+                    ? undefined
+                    : true
+                : hasSecondOrType;
+
         // Parts
         const parts = [
             date.getFullYear(),

package/src/NumberUtils.ts

@@ -18,6 +18,16 @@ Number.prototype.toExact = function (this: number, precision?: number) {
 };
 
 export namespace NumberUtils {
+    export function format(
+        input: undefined | null,
+        locale?: string | string[],
+        options?: Intl.NumberFormatOptions
+    ): undefined;
+    export function format(
+        input: number | bigint,
+        locale?: string | string[],
+        options?: Intl.NumberFormatOptions
+    ): string;
     /**
      * Format number
      * @param input Input
@@ -26,7 +36,7 @@ export namespace NumberUtils {
      * @returns Result
      */
     export function format(
-        input?: number | bigint,
+        input: number | bigint | undefined | null,
         locale?: string | string[],
         options?: Intl.NumberFormatOptions
     ) {
@@ -38,6 +48,20 @@ export namespace NumberUtils {
         return intl.format(input);
     }
 
+    export function formatMoney(
+        input: undefined | null,
+        currency?: string,
+        locale?: string | string[],
+        isInteger?: boolean,
+        options?: Intl.NumberFormatOptions
+    ): undefined;
+    export function formatMoney(
+        input: number | bigint,
+        currency?: string,
+        locale?: string | string[],
+        isInteger?: boolean,
+        options?: Intl.NumberFormatOptions
+    ): string;
     /**
      * Format money
      * @param input Input
@@ -48,12 +72,14 @@ export namespace NumberUtils {
      * @returns Result
      */
     export function formatMoney(
-        input?: number | bigint,
+        input: number | bigint | undefined | null,
         currency?: string,
         locale?: string | string[],
         isInteger: boolean = false,
         options: Intl.NumberFormatOptions = {}
     ) {
+        if (input == null) return format(input, locale, options);
+
         if (currency) {
             // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/NumberFormat
             options.style = 'currency';
@@ -73,9 +99,7 @@ export namespace NumberUtils {
      * Parse float value
      * @param rawData Raw data
      */
-    export const parse = (
-        rawData: string | number | undefined | object
-    ): number => {
+    export const parse = (rawData: unknown): number => {
         if (rawData == null) {
             return Number.NaN;
         }