@zelgadis87/utils-core 4.13.2 → 4.13.4

package/package.json

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

package/src/sorting/Sorter.ts

@@ -365,7 +365,7 @@ type TSorterStepFull<T, Ret> = TSorterStepForRecords<T, Ret>
 	& TSorterStepForChainables<T, Ret>
 	& TSorterStepForUsing<T, Ret>
 	;
-type TSorterStarter<T> = TSorterStepUsing<T, TSorter<T>>;
+type TSorterStarter<T> = TSorterStepUsing<T, TSorter<T>> & TSorterStepForUsing<T, TSorter<T>>;
 export type TSorterBuilder<T> = ( builder: TSorterStarter<T> ) => TSorter<T>;
 
 type TStringComparisonOptions = TCompareFunctionOptions & { ignoreCase: boolean };
@@ -390,7 +390,7 @@ type TPrioritizeOptions = {};
 const defaultPrioritizeOptions = {} as const satisfies Partial<TPrioritizeOptions>;
 
 export const Sorter = {
-	createFor: <T>() => doCreateEmpty<T>(),
+	createFor: <T>( _template?: T ) => doCreateEmpty<T>(),
 	sort: <T>( arr: TReadableArray<T>, builder: TSorterBuilder<T> ) => builder( doCreateEmpty() ).sort( arr ),
 	top: <T>( arr: TReadableArray<T>, n: TPositiveNumber, builder: TSorterBuilder<T> ) => builder( doCreateEmpty() ).top( arr, n ),
 	bottom: <T>( arr: TReadableArray<T>, n: TPositiveNumber, builder: TSorterBuilder<T> ) => builder( doCreateEmpty() ).bottom( arr, n ),

package/src/time/TimeInstantBuilder.ts

@@ -1,15 +1,17 @@
 
 import { TFunction } from "../utils/functions.js";
 import { ensureDefined } from "../utils/nulls.js";
+import { monthNames } from "./constants.js";
 import { TimeInstant, isTimeInstant } from "./TimeInstant.js";
-import { TDayOfMonth, THourOfDay, TMillisecondOfSecond, TMinuteOfHour, TMonth, TSecondOfMinute, TUpToTwoDigits } from "./types.js";
+import { TDayOfMonth, THourOfDay, TMillisecondOfSecond, TMinuteOfHour, TMonth, TSecondOfMinute, TUpToTwoDigits, type TMonthName } from "./types.js";
 
 type TRelativeSignum = '+' | '-';
 type TRelativeNumber = `${TRelativeSignum}${TUpToTwoDigits}`;
 const isRelativeNumber = ( x: string ): x is TRelativeNumber => x !== undefined && x.length > 0 && ( x[ 0 ] === '+' || x[ 0 ] === '-' );
+
 export type TTimeInstantCreationParameters = {
 	year: number | { absolute: number } | TRelativeNumber | { relative: number, relativeTo: 'now' | TimeInstant } | 'next' | 'last' | 'current' | undefined;
-	month: TMonth | { absolute: TMonth } | keyof typeof monthNames | TRelativeNumber | { relative: number, relativeTo: 'now' | TimeInstant } | 'next' | 'last' | 'current' | undefined;
+	month: TMonth | { absolute: TMonth } | TMonthName | TRelativeNumber | { relative: number, relativeTo: 'now' | TimeInstant } | 'next' | 'last' | 'current' | undefined;
 	date: TDayOfMonth | { absolute: TDayOfMonth } | TRelativeNumber | { relative: number, relativeTo: 'now' | TimeInstant } | 'next' | 'last' | 'current' | undefined;
 	hours: THourOfDay | { absolute: THourOfDay } | TRelativeNumber | { relative: number, relativeTo: 'now' | TimeInstant } | 'next' | 'last' | 'current' | undefined;
 	minutes: TMinuteOfHour | { absolute: TMinuteOfHour } | TRelativeNumber | { relative: number, relativeTo: 'now' | TimeInstant } | 'next' | 'last' | 'current' | undefined;
@@ -31,22 +33,9 @@ const timeInstantCreationRelativeAliases = {
 	last: -1,
 	next: +1,
 } as const satisfies Record<string, number>;
-const monthNames = {
-	january: 1,
-	february: 2,
-	march: 3,
-	april: 4,
-	may: 5,
-	june: 6,
-	july: 7,
-	august: 8,
-	september: 9,
-	october: 10,
-	november: 11,
-	december: 12,
-} as const satisfies Record<string, number>;
+
 type TAllowedTimeInstantCreationAlias = keyof typeof timeInstantCreationRelativeAliases;
-type TAllowedTimeInstantCreationParameter = { absolute: number } | { relative: number, relativeTo?: TimeInstant | 'now' } | TAllowedTimeInstantCreationAlias | TRelativeNumber | keyof typeof monthNames | number | undefined;
+type TAllowedTimeInstantCreationParameter = { absolute: number } | { relative: number, relativeTo?: TimeInstant | 'now' } | TAllowedTimeInstantCreationAlias | TRelativeNumber | TMonthName | number | undefined;
 const timeInstantResolveValue = ( getFromDate: TFunction<Date, number>, referenceDate: Date, x: TAllowedTimeInstantCreationParameter ): number => {
 	if ( x === undefined ) {
 		return getFromDate( referenceDate );

package/src/time/constants.ts

@@ -0,0 +1,15 @@
+
+export const monthNames = {
+	january: 1,
+	february: 2,
+	march: 3,
+	april: 4,
+	may: 5,
+	june: 6,
+	july: 7,
+	august: 8,
+	september: 9,
+	october: 10,
+	november: 11,
+	december: 12,
+} as const satisfies Record<string, number>;

package/src/time/types.ts

@@ -1,4 +1,5 @@
 import { TDigit, TDigit1_9, TNumber0_1000, TParseableInt } from "../utils/_index";
+import type { monthNames } from "./constants.ts";
 
 export type TOneDigit = `${TDigit}`;
 export type TTwoDigits = `${TDigit}${TDigit}`;
@@ -19,6 +20,7 @@ export type TFourDigitsYear = TFourDigits;
 export type TFourDigitsMillisecond = `${'+' | '-'}${TThreeDigits}`;
 
 export type TMonth = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
+export type TMonthName = keyof typeof monthNames;
 
 export type TDayOfMonth = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9
 	| 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19

package/src/utils/css.ts

@@ -1,4 +1,4 @@
-import { isFunction, repeat, type TProducer } from "./_index.ts";
+import { isDefined, isFunction, repeat, type TProducer } from "./_index.ts";
 import { type TKeysOfType } from "./records.ts";
 
 export type TCssRuleDeclarationKey = TKeysOfType<CSSStyleDeclaration, string> & string;
@@ -9,8 +9,6 @@ export type TCssSelectorDeclarationRulesDictionary = {
 	[ selector: string ]: TCssDeclarationRulesDictionary | TCssSelectorDeclarationRulesDictionary;
 }
 
-type TProduceable<T> = T | TProducer<T>;
-
 const newLine = '\n', tabulation = '\t', colon = ':', semiColon = ';', space = ' ', openBracket = '{', closeBracket = '}';
 
 export function cssDeclarationRulesDictionaryToCss( syleDeclarationRulesForSelectorsProduceable: TProduceable<TCssSelectorDeclarationRulesDictionary>, indent = 0 ) {
@@ -33,10 +31,29 @@ export function cssSelectorDeclarationRulesDictionaryToCss( styleDeclarationRule
 	} );
 }
 
+export function transformCssDictionary(
+	dict: TCssSelectorDeclarationRulesDictionary | Partial<Record<TCssGenericDeclarationKey, string>>,
+	transformer: ( key: TCssGenericDeclarationKey, value: string ) => string,
+): TCssSelectorDeclarationRulesDictionary | Partial<Record<TCssGenericDeclarationKey, string>> {
+	const newDict: TCssSelectorDeclarationRulesDictionary | Partial<Record<TCssGenericDeclarationKey, string>> = {};
+	for ( const [ key, value ] of Object.entries( dict ) ) {
+		if ( typeof value === 'string' ) {
+			const newValue = transformer( key as TCssGenericDeclarationKey, value );
+			if ( isDefined( newValue ) ) {
+				newDict[ key ] = newValue;
+			}
+		} else {
+			newDict[ key ] = transformCssDictionary( value, transformer );
+		}
+	}
+	return newDict;
+}
+
 function pascalCaseToKebabCase( s: string ) {
 	return s.split( /([A-Z][a-z]*)/ ).filter( Boolean ).map( n => n.toLowerCase() ).join( '-' );
 }
 
+type TProduceable<T> = T | TProducer<T>;
 function produceableToValue<T>( t: TProduceable<T> ): T {
 	return isFunction( t ) ? t() : t;
 }