		import { describe, it, expect } from 'vitest';
		import { BuildCronExpression, DefaultCronSchedule, DescribeCronExpression, IsPlausibleCronExpression, Ordinal, ParseCronExpression, } from '../util/CronUtils.js';
		describe('cron-utils', () => {
		describe('BuildCronExpression', () => {
		it('builds hourly', () => {
		expect(BuildCronExpression({ ...DefaultCronSchedule(), Kind: 'hourly', Minute: 15 })).toBe('15 * * * *');
		});
		it('builds daily', () => {
		expect(BuildCronExpression({ ...DefaultCronSchedule(), Kind: 'daily', Minute: 30, Hour: 7 })).toBe('30 7 * * *');
		});
		it('builds weekly', () => {
		expect(BuildCronExpression({ ...DefaultCronSchedule(), Kind: 'weekly', Minute: 0, Hour: 9, DayOfWeek: 5 })).toBe('0 9 * * 5');
		});
		it('builds monthly', () => {
		expect(BuildCronExpression({ ...DefaultCronSchedule(), Kind: 'monthly', Minute: 0, Hour: 6, DayOfMonth: 15 })).toBe('0 6 15 * *');
		});
		it('passes advanced raw through trimmed', () => {
		expect(BuildCronExpression({ ...DefaultCronSchedule(), Kind: 'advanced', Raw: ' /5 * * * ' })).toBe('/5 * * *');
		});
		});
		describe('ParseCronExpression', () => {
		it('round-trips each preset', () => {
		const cases = [
		{ cron: '15 * * * *', kind: 'hourly' },
		{ cron: '30 7 * * *', kind: 'daily' },
		{ cron: '0 9 * * 5', kind: 'weekly' },
		{ cron: '0 6 15 * *', kind: 'monthly' },
		];
		for (const { cron, kind } of cases) {
		const parsed = ParseCronExpression(cron);
		expect(parsed.Kind).toBe(kind);
		expect(BuildCronExpression(parsed)).toBe(cron);
		}
		});
		it('falls back to advanced for step / range shapes', () => {
		expect(ParseCronExpression('/5 * * *').Kind).toBe('advanced');
		expect(ParseCronExpression('0 9-17 * * 1-5').Kind).toBe('advanced');
		expect(ParseCronExpression('0 0 1 1 *').Kind).toBe('advanced'); // month pinned
		});
		it('preserves Raw for advanced expressions (never lossy)', () => {
		const parsed = ParseCronExpression('0 9-17 * * 1-5');
		expect(parsed.Raw).toBe('0 9-17 * * 1-5');
		expect(BuildCronExpression(parsed)).toBe('0 9-17 * * 1-5');
		});
		it('treats blank / malformed input as advanced-ish defaults without throwing', () => {
		expect(ParseCronExpression('').Kind).toBe('daily'); // fresh default schedule
		expect(ParseCronExpression('not a cron').Kind).toBe('advanced');
		expect(ParseCronExpression(null).Kind).toBe('daily');
		});
		});
		describe('DescribeCronExpression', () => {
		it('describes presets in words', () => {
		expect(DescribeCronExpression('0 * * * *')).toBe('Every hour, on the hour');
		expect(DescribeCronExpression('15 * * * *')).toBe('Every hour at :15');
		expect(DescribeCronExpression('30 7 * * *')).toBe('Daily at 7:30 AM');
		expect(DescribeCronExpression('0 13 * * 5')).toBe('Every Friday at 1:00 PM');
		expect(DescribeCronExpression('0 6 15 * *')).toBe('Monthly on the 15th at 6:00 AM');
		});
		it('describes common step shapes', () => {
		expect(DescribeCronExpression('* * * * *')).toBe('Every minute');
		expect(DescribeCronExpression('/5 * * *')).toBe('Every 5 minutes');
		expect(DescribeCronExpression('0 /2 * *')).toBe('Every 2 hours at :00');
		});
		it('falls back to the raw expression rather than guessing', () => {
		expect(DescribeCronExpression('0 9-17 * * 1-5')).toBe('0 9-17 * * 1-5');
		});
		it('handles midnight and noon correctly', () => {
		expect(DescribeCronExpression('0 0 * * *')).toBe('Daily at 12:00 AM');
		expect(DescribeCronExpression('0 12 * * *')).toBe('Daily at 12:00 PM');
		});
		});
		describe('Ordinal', () => {
		it('handles the tricky teens', () => {
		expect(Ordinal(1)).toBe('1st');
		expect(Ordinal(2)).toBe('2nd');
		expect(Ordinal(3)).toBe('3rd');
		expect(Ordinal(11)).toBe('11th');
		expect(Ordinal(12)).toBe('12th');
		expect(Ordinal(13)).toBe('13th');
		expect(Ordinal(21)).toBe('21st');
		expect(Ordinal(22)).toBe('22nd');
		expect(Ordinal(23)).toBe('23rd');
		});
		});
		describe('IsPlausibleCronExpression', () => {
		it('accepts 5 and 6 field expressions', () => {
		expect(IsPlausibleCronExpression('0 9 * * *')).toBe(true);
		expect(IsPlausibleCronExpression('0 0 9 * * *')).toBe(true);
		});
		it('rejects other shapes', () => {
		expect(IsPlausibleCronExpression('')).toBe(false);
		expect(IsPlausibleCronExpression('0 9')).toBe(false);
		expect(IsPlausibleCronExpression('a b c d e f g')).toBe(false);
		});
		});
		});
		//# sourceMappingURL=CronUtils.test.js.map

+1

dist/__tests__/CronUtils.test.js.map

+53

dist/util/CronUtils.d.ts

		/**
		* Pure, dependency-free cron helpers: friendly preset (hourly / daily / weekly /
		* monthly) ↔ 5-field cron expression round-tripping, human-readable descriptions,
		* and a lightweight plausibility check. Originally built for the User Routines
		* editor; general-purpose for any schedule-editing UI.
		*
		* NOT a cron engine: for real validation, is-due checks, and next-occurrence math
		* use `CronExpressionHelper` in `@memberjunction/scheduling-engine` (parser-backed;
		* it can't live here without pulling cron-parser + core into MJGlobal).
		* {@link IsPlausibleCronExpression} is only a UI pre-filter, not validation.
		*/
		/** Which schedule preset a cron expression corresponds to (or 'advanced' when none). */
		export type CronPresetKind = 'hourly' \| 'daily' \| 'weekly' \| 'monthly' \| 'advanced';
		/** Structured schedule the editor binds to; converted to/from a cron expression. */
		export interface CronSchedule {
		/** The preset in effect. 'advanced' means Raw is authoritative. */
		Kind: CronPresetKind;
		/** Minute (0-59). Hourly: minute past each hour. Other presets: minute of the run time. */
		Minute: number;
		/** Hour (0-23) for daily / weekly / monthly presets. */
		Hour: number;
		/** Day of week (0-6, 0 = Sunday) for the weekly preset. */
		DayOfWeek: number;
		/** Day of month (1-31) for the monthly preset. */
		DayOfMonth: number;
		/** Raw cron expression — authoritative when Kind === 'advanced'. */
		Raw: string;
		}
		/** Weekday display names indexed by cron day-of-week value (0 = Sunday). */
		export declare const CRON_DAY_NAMES: readonly string[];
		/** A fresh default schedule: daily at 9:00 AM. */
		export declare function DefaultCronSchedule(): CronSchedule;
		/** Builds the cron expression for a structured schedule. */
		export declare function BuildCronExpression(schedule: CronSchedule): string;
		/**
		* Parses a cron expression back into a structured schedule, detecting the friendly
		* presets the editor can render. Anything that doesn't match a preset shape comes
		* back as 'advanced' with Raw preserved (never lossy).
		*/
		export declare function ParseCronExpression(cron: string \| null \| undefined): CronSchedule;
		/**
		* Human-friendly description of a cron expression. Covers the editor presets plus a
		* couple of common step shapes; anything else falls back to the raw expression so the
		* UI never shows a wrong description.
		*/
		export declare function DescribeCronExpression(cron: string \| null \| undefined): string;
		/** Formats an hour/minute pair as a 12-hour clock time (e.g. "9:05 AM"). */
		export declare function FormatTimeOfDay(hour: number, minute: number): string;
		/** English ordinal for a day-of-month (1 → "1st", 22 → "22nd"). */
		export declare function Ordinal(n: number): string;
		/** Loose sanity check for a raw (advanced) cron expression: 5 or 6 whitespace-separated fields. */
		export declare function IsPlausibleCronExpression(raw: string): boolean;
		//# sourceMappingURL=CronUtils.d.ts.map

+1

dist/util/CronUtils.d.ts.map

{"version":3,"file":"CronUtils.d.ts","sourceRoot":"","sources":["../../src/util/CronUtils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,wFAAwF;AACxF,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,CAAC;AAEpF,oFAAoF;AACpF,MAAM,WAAW,YAAY;IACzB,mEAAmE;IACnE,IAAI,EAAE,cAAc,CAAC;IACrB,2FAA2F;IAC3F,MAAM,EAAE,MAAM,CAAC;IACf,wDAAwD;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,2DAA2D;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;IACnB,oEAAoE;IACpE,GAAG,EAAE,MAAM,CAAC;CACf;AAED,4EAA4E;AAC5E,eAAO,MAAM,cAAc,EAAE,SAAS,MAAM,EAE3C,CAAC;AAEF,kDAAkD;AAClD,wBAAgB,mBAAmB,IAAI,YAAY,CAElD;AAED,4DAA4D;AAC5D,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,CAalE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,YAAY,CA0CjF;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAiC9E;AAED,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAIpE;AAED,mEAAmE;AACnE,wBAAgB,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAWzC;AAED,mGAAmG;AACnG,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAG9D"}

+146

dist/util/CronUtils.js

		/**
		* Pure, dependency-free cron helpers: friendly preset (hourly / daily / weekly /
		* monthly) ↔ 5-field cron expression round-tripping, human-readable descriptions,
		* and a lightweight plausibility check. Originally built for the User Routines
		* editor; general-purpose for any schedule-editing UI.
		*
		* NOT a cron engine: for real validation, is-due checks, and next-occurrence math
		* use `CronExpressionHelper` in `@memberjunction/scheduling-engine` (parser-backed;
		* it can't live here without pulling cron-parser + core into MJGlobal).
		* {@link IsPlausibleCronExpression} is only a UI pre-filter, not validation.
		*/
		/** Weekday display names indexed by cron day-of-week value (0 = Sunday). */
		export const CRON_DAY_NAMES = [
		'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'
		];
		/** A fresh default schedule: daily at 9:00 AM. */
		export function DefaultCronSchedule() {
		return { Kind: 'daily', Minute: 0, Hour: 9, DayOfWeek: 1, DayOfMonth: 1, Raw: '' };
		}
		/** Builds the cron expression for a structured schedule. */
		export function BuildCronExpression(schedule) {
		switch (schedule.Kind) {
		case 'hourly':
		return `${schedule.Minute} * * * *`;
		case 'daily':
		return `${schedule.Minute} ${schedule.Hour} * * *`;
		case 'weekly':
		return `${schedule.Minute} ${schedule.Hour} * * ${schedule.DayOfWeek}`;
		case 'monthly':
		return `${schedule.Minute} ${schedule.Hour} ${schedule.DayOfMonth} * *`;
		case 'advanced':
		return schedule.Raw.trim();
		}
		}
		/**
		* Parses a cron expression back into a structured schedule, detecting the friendly
		* presets the editor can render. Anything that doesn't match a preset shape comes
		* back as 'advanced' with Raw preserved (never lossy).
		*/
		export function ParseCronExpression(cron) {
		const result = DefaultCronSchedule();
		const raw = (cron ?? '').trim();
		result.Raw = raw;
		if (!raw) {
		return result;
		}
		const parts = raw.split(/\s+/);
		if (parts.length !== 5) {
		result.Kind = 'advanced';
		return result;
		}
		const [minute, hour, dayOfMonth, month, dayOfWeek] = parts;
		if (!isSimpleInt(minute) \|\| month !== '*') {
		result.Kind = 'advanced';
		return result;
		}
		const min = parseInt(minute, 10);
		if (hour === '' && dayOfMonth === '' && dayOfWeek === '*') {
		return { ...result, Kind: 'hourly', Minute: min };
		}
		if (isSimpleInt(hour) && dayOfMonth === '' && dayOfWeek === '') {
		return { ...result, Kind: 'daily', Minute: min, Hour: parseInt(hour, 10) };
		}
		if (isSimpleInt(hour) && dayOfMonth === '*' && isSimpleInt(dayOfWeek)) {
		const dow = parseInt(dayOfWeek, 10);
		if (dow >= 0 && dow <= 6) {
		return { ...result, Kind: 'weekly', Minute: min, Hour: parseInt(hour, 10), DayOfWeek: dow };
		}
		}
		if (isSimpleInt(hour) && isSimpleInt(dayOfMonth) && dayOfWeek === '*') {
		const dom = parseInt(dayOfMonth, 10);
		if (dom >= 1 && dom <= 31) {
		return { ...result, Kind: 'monthly', Minute: min, Hour: parseInt(hour, 10), DayOfMonth: dom };
		}
		}
		result.Kind = 'advanced';
		return result;
		}
		/**
		* Human-friendly description of a cron expression. Covers the editor presets plus a
		* couple of common step shapes; anything else falls back to the raw expression so the
		* UI never shows a wrong description.
		*/
		export function DescribeCronExpression(cron) {
		const raw = (cron ?? '').trim();
		if (!raw) {
		return '';
		}
		// Common step shapes that aren't presets but read well in words
		const everyMinute = /^\\s+\\s+\\s+\\s+\*$/;
		if (everyMinute.test(raw)) {
		return 'Every minute';
		}
		const minuteStep = /^\\/(\d+)\s+\\s+\\s+\\s+\*$/.exec(raw);
		if (minuteStep) {
		return `Every ${minuteStep[1]} minutes`;
		}
		const hourStep = /^(\d+)\s+\\/(\d+)\s+\\s+\\s+\$/.exec(raw);
		if (hourStep) {
		return `Every ${hourStep[2]} hours at :${padTwo(parseInt(hourStep[1], 10))}`;
		}
		const schedule = ParseCronExpression(raw);
		switch (schedule.Kind) {
		case 'hourly':
		return schedule.Minute === 0 ? 'Every hour, on the hour' : `Every hour at :${padTwo(schedule.Minute)}`;
		case 'daily':
		return `Daily at ${FormatTimeOfDay(schedule.Hour, schedule.Minute)}`;
		case 'weekly':
		return `Every ${CRON_DAY_NAMES[schedule.DayOfWeek]} at ${FormatTimeOfDay(schedule.Hour, schedule.Minute)}`;
		case 'monthly':
		return `Monthly on the ${Ordinal(schedule.DayOfMonth)} at ${FormatTimeOfDay(schedule.Hour, schedule.Minute)}`;
		case 'advanced':
		return raw;
		}
		}
		/** Formats an hour/minute pair as a 12-hour clock time (e.g. "9:05 AM"). */
		export function FormatTimeOfDay(hour, minute) {
		const suffix = hour < 12 ? 'AM' : 'PM';
		const displayHour = hour % 12 === 0 ? 12 : hour % 12;
		return `${displayHour}:${padTwo(minute)} ${suffix}`;
		}
		/** English ordinal for a day-of-month (1 → "1st", 22 → "22nd"). */
		export function Ordinal(n) {
		const mod100 = n % 100;
		if (mod100 >= 11 && mod100 <= 13) {
		return `${n}th`;
		}
		switch (n % 10) {
		case 1: return `${n}st`;
		case 2: return `${n}nd`;
		case 3: return `${n}rd`;
		default: return `${n}th`;
		}
		}
		/** Loose sanity check for a raw (advanced) cron expression: 5 or 6 whitespace-separated fields. */
		export function IsPlausibleCronExpression(raw) {
		const parts = raw.trim().split(/\s+/);
		return parts.length === 5 \|\| parts.length === 6;
		}
		function isSimpleInt(value) {
		return /^\d+$/.test(value);
		}
		function padTwo(n) {
		return n.toString().padStart(2, '0');
		}
		//# sourceMappingURL=CronUtils.js.map

+1

dist/util/CronUtils.js.map

+1

-0

dist/index.d.ts

		@@ -13,2 +13,3 @@ export { ClassFactory, ClassRegistration } from './ClassFactory.js';
		export * from './util/UUIDUtils.js';
		export * from './util/CronUtils.js';
		export * from './util/SerializationUtils.js';
		@@ -15,0 +16,0 @@ export * from './ValidationTypes.js';

+1

-1

dist/index.d.ts.map

		@@ -1,1 +0,1 @@
		{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAChE,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,oBAAoB,CAAA;AAClC,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,2BAA2B,CAAA;AACzC,cAAc,cAAc,CAAA;AAC5B,cAAc,0BAA0B,CAAA;AACxC,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AAMtC,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA"}
		{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAChE,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,oBAAoB,CAAA;AAClC,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,2BAA2B,CAAA;AACzC,cAAc,cAAc,CAAA;AAC5B,cAAc,0BAA0B,CAAA;AACxC,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AAMtC,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA"}

+1

-0

dist/index.js

		@@ -14,2 +14,3 @@ // Export all types and utilities
		export * from './util/UUIDUtils.js';
		export * from './util/CronUtils.js';
		export * from './util/SerializationUtils.js';
		@@ -16,0 +17,0 @@ export * from './ValidationTypes.js';

+1

-1

dist/index.js.map

		@@ -1,1 +0,1 @@
		{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAChE,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,oBAAoB,CAAA;AAClC,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,2BAA2B,CAAA;AACzC,cAAc,cAAc,CAAA;AAC5B,cAAc,0BAA0B,CAAA;AACxC,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AAEtC,2DAA2D;AAC3D,oCAAoC;AAEpC,0BAA0B;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAE/B,6DAA6D;AAC7D,oCAAoC"}
		{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAChE,cAAc,aAAa,CAAA;AAC3B,cAAc,QAAQ,CAAA;AACtB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAC5B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,oBAAoB,CAAA;AAClC,cAAc,YAAY,CAAA;AAC1B,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAA;AACjC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,2BAA2B,CAAA;AACzC,cAAc,cAAc,CAAA;AAC5B,cAAc,0BAA0B,CAAA;AACxC,cAAc,kBAAkB,CAAA;AAChC,cAAc,mBAAmB,CAAA;AACjC,cAAc,wBAAwB,CAAA;AAEtC,2DAA2D;AAC3D,oCAAoC;AAEpC,0BAA0B;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,iBAAiB,CAAA;AAE/B,6DAA6D;AAC7D,oCAAoC"}

+1

-1

package.json

		{
		"name": "@memberjunction/global",
		"type": "module",
		"version": "5.44.0",
		"version": "5.45.0",
		"description": "MemberJunction: Global Object - Needed for ALL other MJ components",
		@@ -6,0 +6,0 @@ "main": "dist/index.js",

@memberjunction/global - npm Package Compare versions

New alerts

Fixed alerts

Improved metrics