Merge pull request #172 from tschlechtweg/remove-any-from-types

Tweaking types and removing any usage
avoidwork · Aug 7, 2023 · f84d8ee · f84d8ee
2 parents c9fff4f + a3d0dd0
commit f84d8ee
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 42 deletions.
diff --git a/types/constants.d.ts b/types/constants.d.ts
@@ -19,23 +19,20 @@ export const SI_KBYTE: "kB";
 export const SPACE: " ";
 export const STRING: "string";
 export const ZERO: "0";
-export namespace STRINGS {
-    namespace symbol {
-        namespace iec {
-            const bits: string[];
-            const bytes: string[];
+
+export const STRINGS: {
+    symbol: {
+        iec: {
+            bits: string[],
+            bytes: string[]
+        },
+        jedec: {
+            bits: string[],
+            bytes: string[],
         }
-        namespace jedec {
-            const bits_1: string[];
-            export { bits_1 as bits };
-            const bytes_1: string[];
-            export { bytes_1 as bytes };
-        }
-    }
-    namespace fullform {
-        const iec_1: string[];
-        export { iec_1 as iec };
-        const jedec_1: string[];
-        export { jedec_1 as jedec };
+    },
+    fullform: {
+        iec: string[],
+        jedec: string[]
     }
-}
+}
diff --git a/types/filesize.d.ts b/types/filesize.d.ts
@@ -1,32 +1,63 @@
-export interface FileSizeOptions {
+interface FileSizeOptionsBase {
+    base?: number;
     bits?: boolean;
+    exponent?: number;
+    fullform?: boolean;
+    fullforms?: string[];
+    locale?: string | boolean;
+    localeOptions?: Intl.DateTimeFormatOptions;
     pad?: boolean;
-    base?: number;
+    precision?: number;
     round?: number;
-    locale?: string;
-    localeOptions?: {};
+    roundingMethod?: 'round' | 'floor' | 'ceil';
     separator?: string;
     spacer?: string;
-    symbols?: {};
     standard?: 'iec' | 'jedec';
-    output?: 'array' | 'exponent' | 'object' | 'string';
-    fullform?: boolean;
-    fullforms?: any[];
-    exponent?: number;
-    roundingMethod?: 'round' | 'floor' | 'ceil';
-    precision?: number;
+    symbols?: {
+        iec: {
+            bits: string[],
+            bytes: string[]
+        },
+        jedec: {
+            bits: string[],
+            bytes: string[]
+        }
+    };
+}
+
+interface FileSizeOptionsArray extends FileSizeOptionsBase {
+    output: 'array'
+}
+
+interface FileSizeOptionsExponent extends FileSizeOptionsBase {
+    output: 'exponent'
 }
 
-export function filesize(arg: any, { bits, pad, base, round, locale, localeOptions, separator, spacer, symbols, standard, output, fullform, fullforms, exponent, roundingMethod, precision }?: FileSizeOptions): string | number | any[] | {
-    value: any;
-    symbol: any;
-    exponent: number;
-    unit: string;
-};
-
-export function partial({ bits, pad, base, round, locale, localeOptions, separator, spacer, symbols, standard, output, fullform, fullforms, exponent, roundingMethod, precision }?: FileSizeOptions): (arg: any) => string | number | any[] | {
-    value: any;
-    symbol: any;
-    exponent: number;
-    unit: string;
-};
+interface FileSizeOptionsObject extends FileSizeOptionsBase {
+    output: 'object'
+}
+
+interface FileSizeOptionsString extends FileSizeOptionsBase {
+    output: 'string'
+}
+
+interface FileSizeReturnObject {
+    value: string,
+    symbol: string,
+    exponent: number,
+    unit: string,
+}
+
+type FileSizeReturnArray = [ number, string ]
+
+export function filesize(byteCount: number, options: FileSizeOptionsString): string
+export function filesize(byteCount: number, options: FileSizeOptionsArray): FileSizeReturnArray
+export function filesize(byteCount: number, options: FileSizeOptionsExponent): number
+export function filesize(byteCount: number, options: FileSizeOptionsObject): FileSizeReturnObject
+export function filesize(byteCount: number): string
+
+export function partial(options: FileSizeOptionsString): (byteCount: number) => string
+export function partial(options: FileSizeOptionsArray): (byteCount: number) => FileSizeReturnArray
+export function partial(options: FileSizeOptionsExponent): (byteCount: number) => number
+export function partial(options: FileSizeOptionsObject): (byteCount: number) => FileSizeReturnObject
+export function partial(): (byteCount: number) => string