@etsoo/shared 1.1.1 → 1.1.5

package/README.md

@@ -36,6 +36,7 @@ Data type definitions and type safe functions
 |EnumBase|Enum base type|
 |EnumValue|Enum value type|
 |ExtendedEnum|Extended type enum|
+|Func<R>|Function type, R is return type|
 |HAlign|Horizontal align|
 |HAlignEnum|Horizontal align enum|
 |IdType|Number and string combination id type|

package/__tests__/DataTypes.ts

@@ -72,6 +72,9 @@ test('Tests for getEnumKeys', () => {
         GRAM = 'GRAM33'
     }
     expect(DataTypes.getEnumKeys(ProductUnit)).toContainEqual('GRAM');
+
+    const keys = DataTypes.getEnumKeys(DataTypes.CombinedEnum);
+    expect(keys).toContainEqual('Unkwown');
 });
 
 test('Tests for getItemId', () => {

package/__tests__/Utils.ts

@@ -141,7 +141,10 @@ test('Tests for getResult', () => {
     const inputNumber: test = 5;
 
     // Act & assert
-    expect(Utils.getResult(input, true)).toBe(1);
+    const result = Utils.getResult(input, true);
+    expect(result).toBe(1);
     expect(Utils.getResult(input, false)).toBe(0);
-    expect(Utils.getResult(inputNumber)).toBe(5);
+
+    const valueResult = Utils.getResult(inputNumber);
+    expect(valueResult).toBe(5);
 });

package/lib/cjs/DataTypes.d.ts

@@ -128,6 +128,10 @@ export declare namespace DataTypes {
      * Enum base type
      */
     type EnumBase = Record<string, EnumValue>;
+    /**
+     * Function type
+     */
+    type Func<R> = (...args: any[]) => R;
     /**
      * String key, unknown value Record
      */
@@ -251,7 +255,7 @@ export declare namespace DataTypes {
      * @param input Input Enum
      * @returns Keys
      */
-    function getEnumKeys<T extends EnumBase, K extends keyof T>(input: T): K[];
+    function getEnumKeys<T extends EnumBase, K extends keyof T & string>(input: T): K[];
     /**
      * Get object id field value
      * @param data Data

package/lib/cjs/Utils.d.ts

@@ -75,7 +75,7 @@ export declare namespace Utils {
      * @param args Arguments
      * @returns Result
      */
-    const getResult: <R, F extends R | ((...args: unknown[]) => R)>(input: F, ...args: unknown[]) => R;
+    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;
     /**
      * Get time zone
      * @returns Timezone

package/lib/mjs/DataTypes.d.ts

@@ -128,6 +128,10 @@ export declare namespace DataTypes {
      * Enum base type
      */
     type EnumBase = Record<string, EnumValue>;
+    /**
+     * Function type
+     */
+    type Func<R> = (...args: any[]) => R;
     /**
      * String key, unknown value Record
      */
@@ -251,7 +255,7 @@ export declare namespace DataTypes {
      * @param input Input Enum
      * @returns Keys
      */
-    function getEnumKeys<T extends EnumBase, K extends keyof T>(input: T): K[];
+    function getEnumKeys<T extends EnumBase, K extends keyof T & string>(input: T): K[];
     /**
      * Get object id field value
      * @param data Data

package/lib/mjs/Utils.d.ts

@@ -75,7 +75,7 @@ export declare namespace Utils {
      * @param args Arguments
      * @returns Result
      */
-    const getResult: <R, F extends R | ((...args: unknown[]) => R)>(input: F, ...args: unknown[]) => R;
+    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;
     /**
      * Get time zone
      * @returns Timezone

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.1.1",
+    "version": "1.1.5",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -55,13 +55,13 @@
     "dependencies": {},
     "devDependencies": {
         "@types/jest": "^27.4.0",
-        "@typescript-eslint/eslint-plugin": "^5.9.0",
-        "@typescript-eslint/parser": "^5.9.0",
-        "eslint": "^8.6.0",
+        "@typescript-eslint/eslint-plugin": "^5.10.0",
+        "@typescript-eslint/parser": "^5.10.0",
+        "eslint": "^8.7.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.4",
         "jest": "^27.4.7",
-        "ts-jest": "^27.1.2",
+        "ts-jest": "^27.1.3",
         "typescript": "^4.5.4"
     }
 }

package/src/DataTypes.ts

@@ -166,6 +166,11 @@ export namespace DataTypes {
      */
     export type EnumBase = Record<string, EnumValue>;
 
+    /**
+     * Function type
+     */
+    export type Func<R> = (...args: any[]) => R;
+
     /**
      * String key, unknown value Record
      */
@@ -492,7 +497,7 @@ export namespace DataTypes {
      * @param input Input Enum
      * @returns Keys
      */
-    export function getEnumKeys<T extends EnumBase, K extends keyof T>(
+    export function getEnumKeys<T extends EnumBase, K extends keyof T & string>(
         input: T
     ): K[] {
         return Object.keys(input)

package/src/Utils.ts

@@ -193,10 +193,10 @@ export namespace Utils {
      * @param args Arguments
      * @returns Result
      */
-    export const getResult = <R, F extends ((...args: unknown[]) => R) | R>(
-        input: F,
-        ...args: unknown[]
-    ): R => {
+    export const getResult = <R, T = DataTypes.Func<R> | R>(
+        input: T,
+        ...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;
     };