zavadil-ts-common 1.2.67 → 1.2.69

package/dist/util/ObjectUtil.d.ts

@@ -1,5 +1,5 @@
 export declare class ObjectUtil {
-    static isEmpty(obj: any): boolean;
+    static isEmpty(obj: any): obj is null | undefined;
     static notEmpty(obj: any): boolean;
     static clone<T>(obj: T): T;
     static getNestedValue(obj: any, path: string): string;

package/dist/util/StringUtil.d.ts

@@ -1,12 +1,12 @@
 export declare class StringUtil {
     static toString(s: any): string;
-    static isEmpty(str: string | null | undefined): boolean;
+    static isEmpty(str: string | null | undefined): str is null | undefined;
     static notEmpty(str: string | null | undefined): str is string;
-    static isBlank(str: string | null | undefined): boolean;
+    static isBlank(str: string | null | undefined): str is null | undefined | "";
     static notBlank(str: string | null | undefined): str is string;
     static substr(str: string | null | undefined, start: number, length?: number): string;
     static replace(str: string | null | undefined, find?: null | string, replace?: string): string;
-    static containsLineBreaks(str: string | null | undefined): boolean;
+    static containsLineBreaks(str: string | null | undefined): str is string;
     static trimLeadingSlashes(str: string | null): string;
     static trimTrailingSlashes(str: string | null): string;
     static trimSlashes(str: string | null): string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zavadil-ts-common",
-	"version": "1.2.67",
+	"version": "1.2.69",
 	"description": "Common types and components for Typescript UI apps.",
 	"main": "dist/index.js",
 	"module": "dist/index.esm.js",

package/src/util/ObjectUtil.ts

@@ -2,7 +2,7 @@ import {StringUtil} from "./StringUtil";
 
 export class ObjectUtil {
 
-	static isEmpty(obj: any) {
+	static isEmpty(obj: any): obj is null | undefined {
 		return obj === undefined || obj === null;
 	}
 

package/src/util/StringUtil.ts

@@ -1,11 +1,13 @@
+import {ObjectUtil} from "./ObjectUtil";
+
 export class StringUtil {
 
 	static toString(s: any): string {
 		return typeof s === 'string' ? s : s?.toString?.() ?? '';
 	}
 
-	static isEmpty(str: string | null | undefined): boolean {
-		if (typeof str !== 'string') return StringUtil.isEmpty(StringUtil.toString(str));
+	static isEmpty(str: string | null | undefined): str is null | undefined {
+		if (ObjectUtil.isEmpty(str)) return true;
 		return str.length === 0;
 	}
 
@@ -13,7 +15,7 @@ export class StringUtil {
 		return !StringUtil.isEmpty(str);
 	}
 
-	static isBlank(str: string | null | undefined): boolean {
+	static isBlank(str: string | null | undefined): str is null | undefined | "" {
 		return StringUtil.isEmpty(StringUtil.safeTrim(str));
 	}
 
@@ -30,13 +32,11 @@ export class StringUtil {
 
 	static replace(str: string | null | undefined, find?: null | string, replace?: string): string {
 		if (this.isEmpty(str) || this.isEmpty(find)) return '';
-
-		// @ts-ignore
 		return str.replace(find, String(replace));
 	}
 
-	static containsLineBreaks(str: string | null | undefined): boolean {
-		if (str === null || str === undefined || str.trim().length === 0) return false;
+	static containsLineBreaks(str: string | null | undefined): str is string {
+		if (StringUtil.isBlank(str)) return false;
 		return str.includes("\n");
 	}
 
@@ -72,7 +72,7 @@ export class StringUtil {
 	}
 
 	static safeTrim(str: string | null | undefined): string {
-		if (StringUtil.isEmpty(str) || !str) return '';
+		if (StringUtil.isEmpty(str)) return '';
 		return str.trim();
 	}