@zelgadis87/utils-core 4.3.1 → 4.3.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@zelgadis87/utils-core",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "author": "Zelgadis87",
   "license": "ISC",
   "private": false,

package/src/types/arrays.ts

@@ -87,3 +87,10 @@ export function sortedArray<T>( arr: TReadableArray<T>, sortFn?: TComparisonFunc
 export function includes<T>( arr: TReadableArray<T>, item: unknown, fromIndex?: number ) {
 	return arr.includes( item as any, fromIndex );
 }
+
+export function mapTruthys<T, R>( arr: Array<T>, mapper: ( value: T, index: number, array: T[] ) => R | undefined ): Array<R> {
+	return arr.map( mapper ).filter( value => value !== undefined ) as Array<R>;
+}
+export function flatMapTruthys<T, R>( arr: Array<T>, mapper: ( value: T, index: number, array: T[] ) => R | undefined ): Array<R> {
+	return arr.flatMap( mapper ).filter( value => value !== undefined ) as Array<R>;
+}

package/src/types/strings.ts

@@ -1,5 +1,5 @@
 import { range, TReadableArray } from "./arrays.js";
-import { isNullOrUndefined, TMaybe } from "./nulls.js";
+import { ensureDefined, isNullOrUndefined, TMaybe } from "./nulls.js";
 
 // Semantic-only
 export type THtmlString = string;
@@ -31,6 +31,54 @@ export function stringToNumber( s: string | null | undefined ): number | null {
 	return Number( s );
 }
 
+export function pad( str: string, n: number, char: string, where: 'left' | 'right' = 'left' ): string {
+	const length = ensureDefined( str ).length;
+	if ( length >= ensureDefined( n ) ) return str;
+
+	if ( ensureDefined( char ).length !== 1 )
+		throw new Error( 'Illegal pad character' );
+	const padding = repeat( char, n - length );
+	return ( where === 'left' ? padding : '' ) + str + ( where === 'right' ? padding : '' );
+}
+
+export function padLeft( str: string, n: number, char: string ): string {
+	return pad( str, n, char, 'left' );
+}
+
+export function padRight( str: string, n: number, char: string ): string {
+	return pad( str, n, char, 'right' );
+}
+
+export function ellipsis( str: string, maxLength: number, padChar: string, padWhere: 'left' | 'right' = 'left' ): string {
+	if ( maxLength < 4 ) 
+		throw new Error( 'Invalid argument maxLength' );
+	if ( str.length <= maxLength ) {
+		return pad( str, maxLength, padChar, padWhere );
+	} else {
+		return str.substring( 0, maxLength - 3 ) + '...';
+	}
+}
+
+export default function pluralize( n: number, singular: string, plural?: string ): string {
+
+	if ( !singular || !singular.length )
+		throw new Error();
+	if ( n === 1 )
+		return singular;
+
+	plural = plural ?? singular + 's';
+
+	const firstUppercase = singular.charAt( 0 ) === singular.charAt( 0 ).toUpperCase();
+	if ( firstUppercase ) {
+		const PLURAL = plural.toUpperCase();
+		const isAllUppercase = plural === PLURAL;
+		plural = isAllUppercase ? PLURAL : plural.charAt( 0 ).toUpperCase() + plural.slice( 1 ).toLowerCase();
+	}
+
+	return plural;
+
+}
+
 export class StringParts {
 
 	private readonly _parts: string[]

package/src/utils/index.ts

@@ -9,8 +9,6 @@ export { default as jsonCloneDeep } from './jsonCloneDeep';
 export * from './math.js';
 export { default as noop } from './noop';
 export { default as omit } from './omit';
-export { default as pad } from './pad';
-export { default as pluralize } from './pluralize';
 export * from './round.js';
 export { default as sortBy } from './sortBy';
 export { default as throttle } from './throttle';

package/src/utils/pad.ts

@@ -1,20 +0,0 @@
-import { ensureDefined } from "../types/nulls.js";
-import { repeat } from "../types/strings.js";
-
-export default function pad( str: string, n: number, char: string, where: 'left' | 'right' = 'left' ): string {
-	const length = ensureDefined( str ).length;
-	if ( length >= ensureDefined( n ) ) return str;
-
-	if ( ensureDefined( char ).length !== 1 )
-		throw new Error( 'Illegal pad character' );
-	const padding = repeat( char, n - length );
-	return ( where === 'left' ? padding : '' ) + str + ( where === 'right' ? padding : '' );
-}
-
-export function padLeft( str: string, n: number, char: string ): string {
-	return pad( str, n, char, 'left' );
-}
-
-export function padRight( str: string, n: number, char: string ): string {
-	return pad( str, n, char, 'right' );
-}

package/src/utils/pluralize.ts

@@ -1,20 +0,0 @@
-
-export default function pluralize( n: number, singular: string, plural?: string ): string {
-
-	if ( !singular || !singular.length )
-		throw new Error();
-	if ( n === 1 )
-		return singular;
-
-	plural = plural ?? singular + 's';
-
-	const firstUppercase = singular.charAt( 0 ) === singular.charAt( 0 ).toUpperCase();
-	if ( firstUppercase ) {
-		const PLURAL = plural.toUpperCase();
-		const isAllUppercase = plural === PLURAL;
-		plural = isAllUppercase ? PLURAL : plural.charAt( 0 ).toUpperCase() + plural.slice( 1 ).toLowerCase();
-	}
-
-	return plural;
-
-}