zavadil-ts-common 1.2.75 → 1.2.77

package/dist/util/StringUtil.d.ts

@@ -16,6 +16,7 @@ export declare class StringUtil {
     static safeTrim(str: string | null | undefined): string;
     static safeLowercase(str: string | null | undefined): string;
     static safeUppercase(str: string | null | undefined): string;
+    static capitalizeFirstLetter(str: string | null | undefined): string;
     static toBigInt(str: string | null): bigint | null;
     static getNonEmpty(...args: Array<string | null | undefined>): string;
     static getNonBlank(...args: Array<string | null | undefined>): string;

package/dist/util/UrlUtil.d.ts

@@ -3,4 +3,5 @@ export declare class UrlUtil {
     static extractParamFromUrl(url: string, name: string): string | null;
     static paramExistsInUrl(url: string, name: string): boolean;
     static extractHostFromUrl(url: string): string | null;
+    static extractDomainFromUrl(url: string): string | null;
 }

package/package.json

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

package/src/util/OAuthUtil.ts

@@ -4,7 +4,7 @@ import {StringUtil} from "./StringUtil";
 export class OAuthUtil {
 
 	static isValidToken(token?: TokenResponsePayloadBase | null): boolean {
-		return token !== undefined && token !== null && StringUtil.notEmpty(token.token) && !OAuthUtil.isTokenExpired(token);
+		return token !== undefined && token !== null && StringUtil.notBlank(token.token) && !OAuthUtil.isTokenExpired(token);
 	}
 
 	static isTokenExpired(token?: TokenResponsePayloadBase | null): boolean {

package/src/util/StringUtil.ts

@@ -85,6 +85,11 @@ export class StringUtil {
 		return StringUtil.toString(str).toUpperCase();
 	}
 
+	static capitalizeFirstLetter(str: string | null | undefined): string {
+		if (StringUtil.isBlank(str)) return '';
+		return StringUtil.safeUppercase(str.charAt(0)) + StringUtil.safeLowercase(StringUtil.substr(str, 1));
+	}
+
 	static toBigInt(str: string | null): bigint | null {
 		if (this.isEmpty(str)) return null;
 

package/src/util/UrlUtil.ts

@@ -16,9 +16,15 @@ export class UrlUtil {
 	static paramExistsInUrl(url: string, name: string): boolean {
 		return StringUtil.notBlank(UrlUtil.extractParamFromUrl(url, name));
 	}
+
 	static extractHostFromUrl(url: string): string | null {
 		if (StringUtil.isBlank(url)) return null;
 		return new URL(url).host;
 	}
 
+	static extractDomainFromUrl(url: string): string | null {
+		const host = UrlUtil.extractHostFromUrl(url);
+		if (StringUtil.isBlank(host)) return null;
+		return host.split('.').slice(-2).join('.');
+	}
 }

package/tests/index.test.ts

@@ -1,6 +1,4 @@
-import { StringUtil } from '../src/util/StringUtil';
-import {JsonUtil} from "../src/util/JsonUtil";
-import {RestClient} from "../src";
+import { StringUtil, JsonUtil, RestClient } from '../src';
 
 describe('testing StringUtil', () => {
 	test('isEmpty', () => {
@@ -23,6 +21,13 @@ describe('testing StringUtil', () => {
 		expect(StringUtil.getNonEmpty('', null, undefined, 'test')).toBe('test');
 		expect(StringUtil.getNonEmpty('', 'test', undefined, 'test2')).toBe('test');
 	});
+	test('capitalizeFirstLetter', () => {
+		expect(StringUtil.capitalizeFirstLetter('test')).toBe('Test');
+		expect(StringUtil.capitalizeFirstLetter('TesT')).toBe('Test');
+		expect(StringUtil.capitalizeFirstLetter('')).toBe('');
+		expect(StringUtil.capitalizeFirstLetter(null)).toBe('');
+
+	});
 });
 
 describe('testing JsonUtil', () => {