Merge pull request #19 from wz2cool/15-getordefault-增加多值判断最后一个是默认值

fix nonable issue
wz2cool · May 19, 2024 · f211a77 · f211a77
2 parents 5c63db8 + 5b04805
commit f211a77
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ts-commons",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "common methods for typescript",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -77,4 +77,4 @@
     "webpack": "^4.17.1",
     "webpack-cli": "^3.1.0"
   }
-}
+}
diff --git a/src/utils/object.utils.ts b/src/utils/object.utils.ts
@@ -290,16 +290,16 @@ export class ObjectUtils {
    * @example ObjectUtils.getOrDefault(number | null>)(null, null, null)   = null
    * @example ObjectUtils.getOrDefault(number | null>)(null, null, null, 3) = "3"
    */
-  public static getOrDefault<T>(value1: T, defaultValue: T): T;
-  public static getOrDefault<T>(value1: T, value2: T, defaultValue: T): T;
-  public static getOrDefault<T>(value1: T, value2: T, value3: T, defaultValue: T): T;
+  public static getOrDefault<T>(value1: T, defaultValue: NonNullable<T>): NonNullable<T>;
+  public static getOrDefault<T>(value1: T, value2: T, defaultValue: NonNullable<T>): NonNullable<T>;
+  public static getOrDefault<T>(value1: T, value2: T, value3: T, defaultValue: NonNullable<T>): NonNullable<T>;
   public static getOrDefault<T>(
     value1: T,
     value2: T,
     value3: T,
-    defaultValue: T
-  ): T
-  public static getOrDefault<T>(value1: T, value2?: T, value3?: T, defaultValue?: T): T {
+    defaultValue: NonNullable<T>
+  ): NonNullable<T>
+  public static getOrDefault<T>(value1: T, value2?: T, value3?: T, defaultValue?: NonNullable<T>): NonNullable<T> {
     if (!ObjectUtils.isNullOrUndefined(value1)) {
       return value1 as NonNullable<T>;
     }

diff --git a/test/utils/object.utils.test.ts b/test/utils/object.utils.test.ts
@@ -318,15 +318,15 @@ describe(".ObjectUtils", () => {
     it("should return 'defaultValue', if all values is null", () => {
       const value1: string | undefined = undefined;
       const value2: string | undefined = undefined;
-      const result = ObjectUtils.getOrDefault(value1, value2, "defaultValue");
+      const result = ObjectUtils.getOrDefault<string | undefined>(value1, value2, "defaultValue");
       expect("defaultValue").to.be.eq(result);
     })
 
     it("should return 'defaultValue', if all values is null", () => {
       const value1: string | undefined = undefined;
       const value2: string | undefined = undefined;
       const value3: string | undefined = undefined;
-      const result = ObjectUtils.getOrDefault(value1, value2, value3, "defaultValue");
+      const result = ObjectUtils.getOrDefault<string | undefined>(value1, value2, value3, "defaultValue");
       expect("defaultValue").to.be.eq(result);
     })