@wener/common 2.0.3 → 2.0.6

package/lib/dayjs/resolveRelativeTime.test.js

@@ -1,310 +1,299 @@
-import dayjs from "dayjs";
-import quarterOfYear from "dayjs/plugin/quarterOfYear";
-import weekOfYear from "dayjs/plugin/weekOfYear";
-import { describe, expect, it } from "vitest";
-import { resolveRelativeTime } from "./resolveRelativeTime.js";
+import dayjs from 'dayjs';
+import quarterOfYear from 'dayjs/plugin/quarterOfYear';
+import weekOfYear from 'dayjs/plugin/weekOfYear';
+import { describe, expect, it } from 'vitest';
+import { resolveRelativeTime } from './resolveRelativeTime.js';
+
 dayjs.extend(quarterOfYear);
 dayjs.extend(weekOfYear);
-describe("resolveRelativeTime", function () {
-    var fixedDate = new Date("2024-03-15T14:30:45.123Z");
-    describe("basic cases", function () {
-        it("should handle \"now\"", function () {
-            var result = resolveRelativeTime("now", fixedDate);
-            expect(result).toEqual(fixedDate);
-        });
-        it("should handle \"now\" without reference date", function () {
-            var result = resolveRelativeTime("now", undefined);
-            expect(result).toBeInstanceOf(Date);
-        });
-    });
-    describe("subtraction operations", function () {
-        it("should subtract seconds", function () {
-            var result = resolveRelativeTime("now-30s", fixedDate);
-            var expected = dayjs(fixedDate).subtract(30, "second").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should subtract minutes", function () {
-            var result = resolveRelativeTime("now-15m", fixedDate);
-            var expected = dayjs(fixedDate).subtract(15, "minute").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should subtract hours", function () {
-            var result = resolveRelativeTime("now-2h", fixedDate);
-            var expected = dayjs(fixedDate).subtract(2, "hour").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should subtract days", function () {
-            var result = resolveRelativeTime("now-7d", fixedDate);
-            var expected = dayjs(fixedDate).subtract(7, "day").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should subtract weeks", function () {
-            var result = resolveRelativeTime("now-2w", fixedDate);
-            var expected = dayjs(fixedDate).subtract(2, "week").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should subtract months", function () {
-            var result = resolveRelativeTime("now-1M", fixedDate);
-            var expected = dayjs(fixedDate).subtract(1, "month").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should subtract quarters", function () {
-            var result = resolveRelativeTime("now-1Q", fixedDate);
-            var expected = dayjs(fixedDate).subtract(1, "quarter").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should subtract years", function () {
-            var result = resolveRelativeTime("now-1y", fixedDate);
-            var expected = dayjs(fixedDate).subtract(1, "year").toDate();
-            expect(result).toEqual(expected);
-        });
-    });
-    describe("addition operations", function () {
-        it("should add seconds", function () {
-            var result = resolveRelativeTime("now+30s", fixedDate);
-            var expected = dayjs(fixedDate).add(30, "second").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should add minutes", function () {
-            var result = resolveRelativeTime("now+15m", fixedDate);
-            var expected = dayjs(fixedDate).add(15, "minute").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should add hours", function () {
-            var result = resolveRelativeTime("now+3h", fixedDate);
-            var expected = dayjs(fixedDate).add(3, "hour").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should add days", function () {
-            var result = resolveRelativeTime("now+5d", fixedDate);
-            var expected = dayjs(fixedDate).add(5, "day").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should add weeks", function () {
-            var result = resolveRelativeTime("now+2w", fixedDate);
-            var expected = dayjs(fixedDate).add(2, "week").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should add months", function () {
-            var result = resolveRelativeTime("now+2M", fixedDate);
-            var expected = dayjs(fixedDate).add(2, "month").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should add quarters", function () {
-            var result = resolveRelativeTime("now+1Q", fixedDate);
-            var expected = dayjs(fixedDate).add(1, "quarter").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should add years", function () {
-            var result = resolveRelativeTime("now+1y", fixedDate);
-            var expected = dayjs(fixedDate).add(1, "year").toDate();
-            expect(result).toEqual(expected);
-        });
-    });
-    describe("truncation operations", function () {
-        it("should truncate to start of second", function () {
-            var result = resolveRelativeTime("now/s", fixedDate);
-            var expected = dayjs(fixedDate).startOf("second").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to start of minute", function () {
-            var result = resolveRelativeTime("now/m", fixedDate);
-            var expected = dayjs(fixedDate).startOf("minute").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to start of hour", function () {
-            var result = resolveRelativeTime("now/h", fixedDate);
-            var expected = dayjs(fixedDate).startOf("hour").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to start of day", function () {
-            var result = resolveRelativeTime("now/d", fixedDate);
-            var expected = dayjs(fixedDate).startOf("day").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to start of week", function () {
-            var result = resolveRelativeTime("now/w", fixedDate);
-            var expected = dayjs(fixedDate).startOf("week").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to start of month", function () {
-            var result = resolveRelativeTime("now/M", fixedDate);
-            var expected = dayjs(fixedDate).startOf("month").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to start of quarter", function () {
-            var result = resolveRelativeTime("now/Q", fixedDate);
-            var expected = dayjs(fixedDate).startOf("quarter").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to start of year", function () {
-            var result = resolveRelativeTime("now/y", fixedDate);
-            var expected = dayjs(fixedDate).startOf("year").toDate();
-            expect(result).toEqual(expected);
-        });
-    });
-    describe("endOf truncation operations (backslash)", function () {
-        it("should truncate to end of second", function () {
-            var result = resolveRelativeTime("now\\s", fixedDate);
-            var expected = dayjs(fixedDate).endOf("second").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to end of minute", function () {
-            var result = resolveRelativeTime("now\\m", fixedDate);
-            var expected = dayjs(fixedDate).endOf("minute").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to end of hour", function () {
-            var result = resolveRelativeTime("now\\h", fixedDate);
-            var expected = dayjs(fixedDate).endOf("hour").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to end of day", function () {
-            var result = resolveRelativeTime("now\\d", fixedDate);
-            var expected = dayjs(fixedDate).endOf("day").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to end of week", function () {
-            var result = resolveRelativeTime("now\\w", fixedDate);
-            var expected = dayjs(fixedDate).endOf("week").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to end of month", function () {
-            var result = resolveRelativeTime("now\\M", fixedDate);
-            var expected = dayjs(fixedDate).endOf("month").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to end of quarter", function () {
-            var result = resolveRelativeTime("now\\Q", fixedDate);
-            var expected = dayjs(fixedDate).endOf("quarter").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should truncate to end of year", function () {
-            var result = resolveRelativeTime("now\\y", fixedDate);
-            var expected = dayjs(fixedDate).endOf("year").toDate();
-            expect(result).toEqual(expected);
-        });
-    });
-    describe("complex combinations", function () {
-        it("should handle \"now-1M/M\" (start of previous month)", function () {
-            var result = resolveRelativeTime("now-1M/M", fixedDate);
-            var expected = dayjs(fixedDate).subtract(1, "month").startOf("month").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now/d+1d-1s\" (end of current day)", function () {
-            var result = resolveRelativeTime("now/d+1d-1s", fixedDate);
-            var expected = dayjs(fixedDate).startOf("day").add(1, "day").subtract(1, "second").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle multiple operations \"now-1w+2d-3h\"", function () {
-            var result = resolveRelativeTime("now-1w+2d-3h", fixedDate);
-            var expected = dayjs(fixedDate).subtract(1, "week").add(2, "day").subtract(3, "hour").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now-1M\\M\" (end of previous month)", function () {
-            var result = resolveRelativeTime("now-1M\\M", fixedDate);
-            var expected = dayjs(fixedDate).subtract(1, "month").endOf("month").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now\\d\" vs \"now/d+1d-1s\" (both end of current day)", function () {
-            var resultBackslash = resolveRelativeTime("now\\d", fixedDate);
-            var resultAlternative = resolveRelativeTime("now/d+1d-1s", fixedDate);
-            var expectedBackslash = dayjs(fixedDate).endOf("day").toDate();
-            var expectedAlternative = dayjs(fixedDate).startOf("day").add(1, "day").subtract(1, "second").toDate();
-            expect(resultBackslash).toEqual(expectedBackslash);
-            expect(resultAlternative).toEqual(expectedAlternative);
-            // Note: endOf gives millisecond precision (.999), while alternative gives second precision (.000)
-            // Both represent end of day, but endOf is more precise
-            expect(resultBackslash.getTime()).toBeGreaterThan(resultAlternative.getTime());
-        });
-        it("should handle \"now-1y\\y\" (end of previous year)", function () {
-            var result = resolveRelativeTime("now-1y\\y", fixedDate);
-            var expected = dayjs(fixedDate).subtract(1, "year").endOf("year").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now/y+6M\" (middle of current year)", function () {
-            var result = resolveRelativeTime("now/y+6M", fixedDate);
-            var expected = dayjs(fixedDate).startOf("year").add(6, "month").toDate();
-            expect(result).toEqual(expected);
-        });
-    });
-    describe("error cases", function () {
-        it("should throw error for invalid format", function () {
-            expect(function () {
-                return resolveRelativeTime("invalid", fixedDate);
-            }).toThrow("Invalid");
-        });
-        it("should throw error for non-now start", function () {
-            expect(function () {
-                return resolveRelativeTime("then-1h", fixedDate);
-            }).toThrow("Invalid");
-        });
-        it("should throw error for invalid time unit", function () {
-            expect(function () {
-                return resolveRelativeTime("now-1x", fixedDate);
-            }).toThrow("Invalid time operand");
-        });
-        it("should throw error for invalid operator", function () {
-            expect(function () {
-                return resolveRelativeTime("now*1h", fixedDate);
-            }).toThrow("Invalid relative time format");
-        });
-        it("should throw error for invalid truncation unit", function () {
-            expect(function () {
-                return resolveRelativeTime("now/z", fixedDate);
-            }).toThrow();
-        });
-        it("should throw error for incomplete operation", function () {
-            expect(function () {
-                return resolveRelativeTime("now-", fixedDate);
-            }).toThrow("Invalid relative time format");
-        });
-    });
-    describe("Grafana examples from comments", function () {
-        it("should handle \"now-24h\" (last 24 hours)", function () {
-            var result = resolveRelativeTime("now-24h", fixedDate);
-            var expected = dayjs(fixedDate).subtract(24, "hour").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now/M\" (start of current month)", function () {
-            var result = resolveRelativeTime("now/M", fixedDate);
-            var expected = dayjs(fixedDate).startOf("month").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now-7d\" (last 7 days)", function () {
-            var result = resolveRelativeTime("now-7d", fixedDate);
-            var expected = dayjs(fixedDate).subtract(7, "day").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now/y\" (start of current year)", function () {
-            var result = resolveRelativeTime("now/y", fixedDate);
-            var expected = dayjs(fixedDate).startOf("year").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now/w\" (start of current week)", function () {
-            var result = resolveRelativeTime("now/w", fixedDate);
-            var expected = dayjs(fixedDate).startOf("week").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now\\d\" (end of current day)", function () {
-            var result = resolveRelativeTime("now\\d", fixedDate);
-            var expected = dayjs(fixedDate).endOf("day").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now\\M\" (end of current month)", function () {
-            var result = resolveRelativeTime("now\\M", fixedDate);
-            var expected = dayjs(fixedDate).endOf("month").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now\\w\" (end of current week)", function () {
-            var result = resolveRelativeTime("now\\w", fixedDate);
-            var expected = dayjs(fixedDate).endOf("week").toDate();
-            expect(result).toEqual(expected);
-        });
-        it("should handle \"now\\y\" (end of current year)", function () {
-            var result = resolveRelativeTime("now\\y", fixedDate);
-            var expected = dayjs(fixedDate).endOf("year").toDate();
-            expect(result).toEqual(expected);
-        });
-    });
+describe('resolveRelativeTime', () => {
+	var fixedDate = new Date('2024-03-15T14:30:45.123Z');
+	describe('basic cases', () => {
+		it('should handle "now"', () => {
+			var result = resolveRelativeTime('now', fixedDate);
+			expect(result).toEqual(fixedDate);
+		});
+		it('should handle "now" without reference date', () => {
+			var result = resolveRelativeTime('now', undefined);
+			expect(result).toBeInstanceOf(Date);
+		});
+	});
+	describe('subtraction operations', () => {
+		it('should subtract seconds', () => {
+			var result = resolveRelativeTime('now-30s', fixedDate);
+			var expected = dayjs(fixedDate).subtract(30, 'second').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should subtract minutes', () => {
+			var result = resolveRelativeTime('now-15m', fixedDate);
+			var expected = dayjs(fixedDate).subtract(15, 'minute').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should subtract hours', () => {
+			var result = resolveRelativeTime('now-2h', fixedDate);
+			var expected = dayjs(fixedDate).subtract(2, 'hour').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should subtract days', () => {
+			var result = resolveRelativeTime('now-7d', fixedDate);
+			var expected = dayjs(fixedDate).subtract(7, 'day').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should subtract weeks', () => {
+			var result = resolveRelativeTime('now-2w', fixedDate);
+			var expected = dayjs(fixedDate).subtract(2, 'week').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should subtract months', () => {
+			var result = resolveRelativeTime('now-1M', fixedDate);
+			var expected = dayjs(fixedDate).subtract(1, 'month').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should subtract quarters', () => {
+			var result = resolveRelativeTime('now-1Q', fixedDate);
+			var expected = dayjs(fixedDate).subtract(1, 'quarter').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should subtract years', () => {
+			var result = resolveRelativeTime('now-1y', fixedDate);
+			var expected = dayjs(fixedDate).subtract(1, 'year').toDate();
+			expect(result).toEqual(expected);
+		});
+	});
+	describe('addition operations', () => {
+		it('should add seconds', () => {
+			var result = resolveRelativeTime('now+30s', fixedDate);
+			var expected = dayjs(fixedDate).add(30, 'second').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should add minutes', () => {
+			var result = resolveRelativeTime('now+15m', fixedDate);
+			var expected = dayjs(fixedDate).add(15, 'minute').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should add hours', () => {
+			var result = resolveRelativeTime('now+3h', fixedDate);
+			var expected = dayjs(fixedDate).add(3, 'hour').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should add days', () => {
+			var result = resolveRelativeTime('now+5d', fixedDate);
+			var expected = dayjs(fixedDate).add(5, 'day').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should add weeks', () => {
+			var result = resolveRelativeTime('now+2w', fixedDate);
+			var expected = dayjs(fixedDate).add(2, 'week').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should add months', () => {
+			var result = resolveRelativeTime('now+2M', fixedDate);
+			var expected = dayjs(fixedDate).add(2, 'month').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should add quarters', () => {
+			var result = resolveRelativeTime('now+1Q', fixedDate);
+			var expected = dayjs(fixedDate).add(1, 'quarter').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should add years', () => {
+			var result = resolveRelativeTime('now+1y', fixedDate);
+			var expected = dayjs(fixedDate).add(1, 'year').toDate();
+			expect(result).toEqual(expected);
+		});
+	});
+	describe('truncation operations', () => {
+		it('should truncate to start of second', () => {
+			var result = resolveRelativeTime('now/s', fixedDate);
+			var expected = dayjs(fixedDate).startOf('second').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to start of minute', () => {
+			var result = resolveRelativeTime('now/m', fixedDate);
+			var expected = dayjs(fixedDate).startOf('minute').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to start of hour', () => {
+			var result = resolveRelativeTime('now/h', fixedDate);
+			var expected = dayjs(fixedDate).startOf('hour').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to start of day', () => {
+			var result = resolveRelativeTime('now/d', fixedDate);
+			var expected = dayjs(fixedDate).startOf('day').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to start of week', () => {
+			var result = resolveRelativeTime('now/w', fixedDate);
+			var expected = dayjs(fixedDate).startOf('week').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to start of month', () => {
+			var result = resolveRelativeTime('now/M', fixedDate);
+			var expected = dayjs(fixedDate).startOf('month').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to start of quarter', () => {
+			var result = resolveRelativeTime('now/Q', fixedDate);
+			var expected = dayjs(fixedDate).startOf('quarter').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to start of year', () => {
+			var result = resolveRelativeTime('now/y', fixedDate);
+			var expected = dayjs(fixedDate).startOf('year').toDate();
+			expect(result).toEqual(expected);
+		});
+	});
+	describe('endOf truncation operations (backslash)', () => {
+		it('should truncate to end of second', () => {
+			var result = resolveRelativeTime('now\\s', fixedDate);
+			var expected = dayjs(fixedDate).endOf('second').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to end of minute', () => {
+			var result = resolveRelativeTime('now\\m', fixedDate);
+			var expected = dayjs(fixedDate).endOf('minute').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to end of hour', () => {
+			var result = resolveRelativeTime('now\\h', fixedDate);
+			var expected = dayjs(fixedDate).endOf('hour').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to end of day', () => {
+			var result = resolveRelativeTime('now\\d', fixedDate);
+			var expected = dayjs(fixedDate).endOf('day').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to end of week', () => {
+			var result = resolveRelativeTime('now\\w', fixedDate);
+			var expected = dayjs(fixedDate).endOf('week').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to end of month', () => {
+			var result = resolveRelativeTime('now\\M', fixedDate);
+			var expected = dayjs(fixedDate).endOf('month').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to end of quarter', () => {
+			var result = resolveRelativeTime('now\\Q', fixedDate);
+			var expected = dayjs(fixedDate).endOf('quarter').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should truncate to end of year', () => {
+			var result = resolveRelativeTime('now\\y', fixedDate);
+			var expected = dayjs(fixedDate).endOf('year').toDate();
+			expect(result).toEqual(expected);
+		});
+	});
+	describe('complex combinations', () => {
+		it('should handle "now-1M/M" (start of previous month)', () => {
+			var result = resolveRelativeTime('now-1M/M', fixedDate);
+			var expected = dayjs(fixedDate).subtract(1, 'month').startOf('month').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now/d+1d-1s" (end of current day)', () => {
+			var result = resolveRelativeTime('now/d+1d-1s', fixedDate);
+			var expected = dayjs(fixedDate).startOf('day').add(1, 'day').subtract(1, 'second').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle multiple operations "now-1w+2d-3h"', () => {
+			var result = resolveRelativeTime('now-1w+2d-3h', fixedDate);
+			var expected = dayjs(fixedDate).subtract(1, 'week').add(2, 'day').subtract(3, 'hour').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now-1M\\M" (end of previous month)', () => {
+			var result = resolveRelativeTime('now-1M\\M', fixedDate);
+			var expected = dayjs(fixedDate).subtract(1, 'month').endOf('month').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now\\d" vs "now/d+1d-1s" (both end of current day)', () => {
+			var resultBackslash = resolveRelativeTime('now\\d', fixedDate);
+			var resultAlternative = resolveRelativeTime('now/d+1d-1s', fixedDate);
+			var expectedBackslash = dayjs(fixedDate).endOf('day').toDate();
+			var expectedAlternative = dayjs(fixedDate).startOf('day').add(1, 'day').subtract(1, 'second').toDate();
+			expect(resultBackslash).toEqual(expectedBackslash);
+			expect(resultAlternative).toEqual(expectedAlternative);
+			// Note: endOf gives millisecond precision (.999), while alternative gives second precision (.000)
+			// Both represent end of day, but endOf is more precise
+			expect(resultBackslash.getTime()).toBeGreaterThan(resultAlternative.getTime());
+		});
+		it('should handle "now-1y\\y" (end of previous year)', () => {
+			var result = resolveRelativeTime('now-1y\\y', fixedDate);
+			var expected = dayjs(fixedDate).subtract(1, 'year').endOf('year').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now/y+6M" (middle of current year)', () => {
+			var result = resolveRelativeTime('now/y+6M', fixedDate);
+			var expected = dayjs(fixedDate).startOf('year').add(6, 'month').toDate();
+			expect(result).toEqual(expected);
+		});
+	});
+	describe('error cases', () => {
+		it('should throw error for invalid format', () => {
+			expect(() => resolveRelativeTime('invalid', fixedDate)).toThrow('Invalid');
+		});
+		it('should throw error for non-now start', () => {
+			expect(() => resolveRelativeTime('then-1h', fixedDate)).toThrow('Invalid');
+		});
+		it('should throw error for invalid time unit', () => {
+			expect(() => resolveRelativeTime('now-1x', fixedDate)).toThrow('Invalid time operand');
+		});
+		it('should throw error for invalid operator', () => {
+			expect(() => resolveRelativeTime('now*1h', fixedDate)).toThrow('Invalid relative time format');
+		});
+		it('should throw error for invalid truncation unit', () => {
+			expect(() => resolveRelativeTime('now/z', fixedDate)).toThrow();
+		});
+		it('should throw error for incomplete operation', () => {
+			expect(() => resolveRelativeTime('now-', fixedDate)).toThrow('Invalid relative time format');
+		});
+	});
+	describe('Grafana examples from comments', () => {
+		it('should handle "now-24h" (last 24 hours)', () => {
+			var result = resolveRelativeTime('now-24h', fixedDate);
+			var expected = dayjs(fixedDate).subtract(24, 'hour').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now/M" (start of current month)', () => {
+			var result = resolveRelativeTime('now/M', fixedDate);
+			var expected = dayjs(fixedDate).startOf('month').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now-7d" (last 7 days)', () => {
+			var result = resolveRelativeTime('now-7d', fixedDate);
+			var expected = dayjs(fixedDate).subtract(7, 'day').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now/y" (start of current year)', () => {
+			var result = resolveRelativeTime('now/y', fixedDate);
+			var expected = dayjs(fixedDate).startOf('year').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now/w" (start of current week)', () => {
+			var result = resolveRelativeTime('now/w', fixedDate);
+			var expected = dayjs(fixedDate).startOf('week').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now\\d" (end of current day)', () => {
+			var result = resolveRelativeTime('now\\d', fixedDate);
+			var expected = dayjs(fixedDate).endOf('day').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now\\M" (end of current month)', () => {
+			var result = resolveRelativeTime('now\\M', fixedDate);
+			var expected = dayjs(fixedDate).endOf('month').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now\\w" (end of current week)', () => {
+			var result = resolveRelativeTime('now\\w', fixedDate);
+			var expected = dayjs(fixedDate).endOf('week').toDate();
+			expect(result).toEqual(expected);
+		});
+		it('should handle "now\\y" (end of current year)', () => {
+			var result = resolveRelativeTime('now\\y', fixedDate);
+			var expected = dayjs(fixedDate).endOf('year').toDate();
+			expect(result).toEqual(expected);
+		});
+	});
 });