@etsoo/shared 1.2.5 → 1.2.6

package/__tests__/NumberUtils.ts

@@ -40,3 +40,12 @@ test('Tests for toExact', () => {
     expect(result).not.toBe(0.7);
     expect(result.toExact()).toBe(0.7);
 });
+
+test('Tests for toFileSize', () => {
+    expect(NumberUtils.formatFileSize(1551859712)).toBe('1.45 GB');
+    expect(NumberUtils.formatFileSize(1551859712, 1)).toBe('1.4 GB');
+    expect(NumberUtils.formatFileSize(5000)).toBe('4.88 KB');
+    expect(NumberUtils.formatFileSize(999949)).toBe('976.51 KB');
+    expect(NumberUtils.formatFileSize(1125000)).toBe('1.07 MB');
+    expect(NumberUtils.formatFileSize(1125000, 1)).toBe('1.1 MB');
+});

package/lib/cjs/ArrayUtils.js

@@ -65,4 +65,4 @@ var ArrayUtils;
         return diff;
     }
     ArrayUtils.differences = differences;
-})(ArrayUtils = exports.ArrayUtils || (exports.ArrayUtils = {}));
+})(ArrayUtils || (exports.ArrayUtils = ArrayUtils = {}));

package/lib/cjs/ColorUtils.js

@@ -77,4 +77,4 @@ var ColorUtils;
         return nColors;
     }
     ColorUtils.getEColors = getEColors;
-})(ColorUtils = exports.ColorUtils || (exports.ColorUtils = {}));
+})(ColorUtils || (exports.ColorUtils = ColorUtils = {}));

package/lib/cjs/DataTypes.js

@@ -428,4 +428,4 @@ var DataTypes;
         };
     }
     DataTypes.jsonReplacer = jsonReplacer;
-})(DataTypes = exports.DataTypes || (exports.DataTypes = {}));
+})(DataTypes || (exports.DataTypes = DataTypes = {}));

package/lib/cjs/DateUtils.js

@@ -224,4 +224,4 @@ var DateUtils;
             d1.getMonth() === d2.getMonth());
     }
     DateUtils.sameMonth = sameMonth;
-})(DateUtils = exports.DateUtils || (exports.DateUtils = {}));
+})(DateUtils || (exports.DateUtils = DateUtils = {}));

package/lib/cjs/DomUtils.js

@@ -521,4 +521,4 @@ var DomUtils;
         return false;
     }
     DomUtils.verifyPermission = verifyPermission;
-})(DomUtils = exports.DomUtils || (exports.DomUtils = {}));
+})(DomUtils || (exports.DomUtils = DomUtils = {}));

package/lib/cjs/ExtendUtils.js

@@ -80,4 +80,4 @@ var ExtendUtils;
         });
     }
     ExtendUtils.sleep = sleep;
-})(ExtendUtils = exports.ExtendUtils || (exports.ExtendUtils = {}));
+})(ExtendUtils || (exports.ExtendUtils = ExtendUtils = {}));

package/lib/cjs/Keyboard.js

@@ -267,4 +267,4 @@ var Keyboard;
         return input.length === 1;
     }
     Keyboard.isTypingContent = isTypingContent;
-})(Keyboard = exports.Keyboard || (exports.Keyboard = {}));
+})(Keyboard || (exports.Keyboard = Keyboard = {}));

package/lib/cjs/NumberUtils.d.ts

@@ -26,6 +26,13 @@ export declare namespace NumberUtils {
      * @returns Result
      */
     function formatMoney(input: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string;
+    /**
+     * Format file size
+     * @param size File size
+     * @param fractionDigits Fraction digits
+     * @returns Result
+     */
+    function formatFileSize(size: number, fractionDigits?: number): string;
     /**
      * Get currency symbol or name from ISO code
      * @param code ISO currency code, like USD / CNY

package/lib/cjs/NumberUtils.js

@@ -50,6 +50,19 @@ var NumberUtils;
         return format(input, locale, options);
     }
     NumberUtils.formatMoney = formatMoney;
+    /**
+     * Format file size
+     * @param size File size
+     * @param fractionDigits Fraction digits
+     * @returns Result
+     */
+    function formatFileSize(size, fractionDigits = 2) {
+        const i = size === 0 ? 0 : Math.floor(Math.log(size) / Math.log(1024));
+        return ((size / Math.pow(1024, i)).toFixed(fractionDigits) +
+            ' ' +
+            ['B', 'KB', 'MB', 'GB', 'TB'][i]);
+    }
+    NumberUtils.formatFileSize = formatFileSize;
     /**
      * Get currency symbol or name from ISO code
      * @param code ISO currency code, like USD / CNY
@@ -93,4 +106,4 @@ var NumberUtils;
         }
         return undefined;
     };
-})(NumberUtils = exports.NumberUtils || (exports.NumberUtils = {}));
+})(NumberUtils || (exports.NumberUtils = NumberUtils = {}));

package/lib/cjs/StorageUtils.js

@@ -93,4 +93,4 @@ var StorageUtils;
         return JSON.parse(data);
     }
     StorageUtils.getSessionObject = getSessionObject;
-})(StorageUtils = exports.StorageUtils || (exports.StorageUtils = {}));
+})(StorageUtils || (exports.StorageUtils = StorageUtils = {}));

package/lib/cjs/Utils.d.ts

@@ -140,7 +140,7 @@ export declare namespace Utils {
      * @param args Arguments
      * @returns Result
      */
-    const getResult: <R, T = R | DataTypes.Func<R>>(input: T, ...args: T extends DataTypes.Func<R> ? Parameters<T> : never) => T extends DataTypes.Func<R> ? ReturnType<T> : T;
+    const getResult: <R, T = R | DataTypes.Func<R>>(input: T, ...args: T extends DataTypes.Func<R> ? Parameters<T> : []) => T extends DataTypes.Func<R> ? ReturnType<T> : T;
     /**
      * Get time zone
      * @returns Timezone

package/lib/cjs/Utils.js

@@ -545,4 +545,4 @@ var Utils;
             ++start;
         return input.substring(start);
     };
-})(Utils = exports.Utils || (exports.Utils = {}));
+})(Utils || (exports.Utils = Utils = {}));

package/lib/mjs/NumberUtils.d.ts

@@ -26,6 +26,13 @@ export declare namespace NumberUtils {
      * @returns Result
      */
     function formatMoney(input: number | bigint, currency?: string, locale?: string | string[], isInteger?: boolean, options?: Intl.NumberFormatOptions): string;
+    /**
+     * Format file size
+     * @param size File size
+     * @param fractionDigits Fraction digits
+     * @returns Result
+     */
+    function formatFileSize(size: number, fractionDigits?: number): string;
     /**
      * Get currency symbol or name from ISO code
      * @param code ISO currency code, like USD / CNY

package/lib/mjs/NumberUtils.js

@@ -47,6 +47,19 @@ export var NumberUtils;
         return format(input, locale, options);
     }
     NumberUtils.formatMoney = formatMoney;
+    /**
+     * Format file size
+     * @param size File size
+     * @param fractionDigits Fraction digits
+     * @returns Result
+     */
+    function formatFileSize(size, fractionDigits = 2) {
+        const i = size === 0 ? 0 : Math.floor(Math.log(size) / Math.log(1024));
+        return ((size / Math.pow(1024, i)).toFixed(fractionDigits) +
+            ' ' +
+            ['B', 'KB', 'MB', 'GB', 'TB'][i]);
+    }
+    NumberUtils.formatFileSize = formatFileSize;
     /**
      * Get currency symbol or name from ISO code
      * @param code ISO currency code, like USD / CNY

package/lib/mjs/Utils.d.ts

@@ -140,7 +140,7 @@ export declare namespace Utils {
      * @param args Arguments
      * @returns Result
      */
-    const getResult: <R, T = R | DataTypes.Func<R>>(input: T, ...args: T extends DataTypes.Func<R> ? Parameters<T> : never) => T extends DataTypes.Func<R> ? ReturnType<T> : T;
+    const getResult: <R, T = R | DataTypes.Func<R>>(input: T, ...args: T extends DataTypes.Func<R> ? Parameters<T> : []) => T extends DataTypes.Func<R> ? ReturnType<T> : T;
     /**
      * Get time zone
      * @returns Timezone

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.5",
+    "version": "1.2.6",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,12 +54,12 @@
     },
     "homepage": "https://github.com/ETSOO/Shared#readme",
     "devDependencies": {
-        "@types/jest": "^29.5.1",
+        "@types/jest": "^29.5.2",
         "@types/lodash.isequal": "^4.5.6",
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
         "ts-jest": "^29.1.0",
-        "typescript": "^5.0.4"
+        "typescript": "^5.1.3"
     },
     "dependencies": {
         "lodash.isequal": "^4.5.0"

package/src/NumberUtils.ts

@@ -66,6 +66,21 @@ export namespace NumberUtils {
         return format(input, locale, options);
     }
 
+    /**
+     * Format file size
+     * @param size File size
+     * @param fractionDigits Fraction digits
+     * @returns Result
+     */
+    export function formatFileSize(size: number, fractionDigits: number = 2) {
+        const i = size === 0 ? 0 : Math.floor(Math.log(size) / Math.log(1024));
+        return (
+            (size / Math.pow(1024, i)).toFixed(fractionDigits) +
+            ' ' +
+            ['B', 'KB', 'MB', 'GB', 'TB'][i]
+        );
+    }
+
     /**
      * Get currency symbol or name from ISO code
      * @param code ISO currency code, like USD / CNY

package/src/Utils.ts

@@ -359,7 +359,9 @@ export namespace Utils {
      */
     export const getResult = <R, T = DataTypes.Func<R> | R>(
         input: T,
-        ...args: T extends DataTypes.Func<R> ? Parameters<typeof input> : never
+        ...args: T extends DataTypes.Func<R>
+            ? Parameters<typeof input>
+            : never | []
     ): T extends DataTypes.Func<R> ? ReturnType<T> : T => {
         return typeof input === 'function' ? input(...args) : input;
     };