diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd217428..b835ada1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10644,6 +10644,7 @@ packages: /jsesc@2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} + hasBin: true /jsesc@3.0.2: resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} @@ -15858,6 +15859,7 @@ packages: /yamljs@0.3.0: resolution: {integrity: sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==} + hasBin: true dependencies: argparse: 1.0.10 glob: 7.2.3 diff --git a/src/tools/index.ts b/src/tools/index.ts index 7c333c34..5109abf8 100644 --- a/src/tools/index.ts +++ b/src/tools/index.ts @@ -51,6 +51,7 @@ import { tool as dataStorageUnitConverter } from './data-storage-unit-converter' import { tool as unicodeSearch } from './unicode-search'; import { tool as vatValidator } from './vat-validator'; import { tool as websocketTester } from './websocket-tester'; +import { tool as weekNumberConverter } from './week-number-converter'; import { tool as cssXpathConverter } from './css-xpath-converter'; import { tool as cssSelectorsMemo } from './css-selectors-memo'; @@ -259,6 +260,7 @@ export const toolsByCategory: ToolCategory[] = [ markdownTocGenerator, rmbNumbers, smartRawConverter, + weekNumberConverter, ], }, { diff --git a/src/tools/week-number-converter/index.ts b/src/tools/week-number-converter/index.ts new file mode 100644 index 00000000..8adcb4ed --- /dev/null +++ b/src/tools/week-number-converter/index.ts @@ -0,0 +1,12 @@ +import { Calendar } from '@vicons/tabler'; +import { defineTool } from '../tool'; + +export const tool = defineTool({ + name: 'Week Numbers Converter', + path: '/week-number-converter', + description: 'Compute Week Number in Year/Month vs Date', + keywords: ['week', 'month', 'number', 'converter'], + component: () => import('./week-number-converter.vue'), + icon: Calendar, + createdAt: new Date('2024-08-15'), +}); diff --git a/src/tools/week-number-converter/week-number-converter.service.test.ts b/src/tools/week-number-converter/week-number-converter.service.test.ts new file mode 100644 index 00000000..20e0b901 --- /dev/null +++ b/src/tools/week-number-converter/week-number-converter.service.test.ts @@ -0,0 +1,20 @@ +import { describe, expect, it } from 'vitest'; +import { getWeekOfMonth } from 'date-fns'; +import { getFirstMondayFromISOWeek, getFirstMondayFromMonthWeek } from './week-number-converter.service'; + +describe('week-number-converter', () => { + describe('getFirstMondayFromISOWeek', () => { + it('return right monday date from week number', () => { + expect(getFirstMondayFromISOWeek(11, 2022).toDateString()).toBe('Mon Mar 14 2022'); + expect(getFirstMondayFromISOWeek(1, 2023).toDateString()).toBe('Mon Jan 02 2023'); + expect(getFirstMondayFromISOWeek(53, 2026).toDateString()).toBe('Mon Dec 28 2026'); + }); + }); + describe('getFirstMondayFromMonthWeek', () => { + it('return right date from month week number', () => { + expect(getFirstMondayFromMonthWeek(getWeekOfMonth(new Date('2022-03-14')), 3, 2022).toDateString()).toBe('Mon Mar 14 2022'); + expect(getFirstMondayFromMonthWeek(getWeekOfMonth(new Date('2023-01-02')), 1, 2023).toDateString()).toBe('Mon Jan 02 2023'); + expect(getFirstMondayFromMonthWeek(getWeekOfMonth(new Date('2026-12-28')), 12, 2026).toDateString()).toBe('Mon Dec 28 2026'); + }); + }); +}); diff --git a/src/tools/week-number-converter/week-number-converter.service.ts b/src/tools/week-number-converter/week-number-converter.service.ts new file mode 100644 index 00000000..74d3a1ba --- /dev/null +++ b/src/tools/week-number-converter/week-number-converter.service.ts @@ -0,0 +1,15 @@ +// Returns the first day (Monday) of the specified week + +// Year defaults to the current local calendar year +export function getFirstMondayFromISOWeek(weekInYear: number, year = new Date().getFullYear()) { + const d = new Date(year, 0, 4); + d.setDate(d.getDate() - (d.getDay() || 7) + 1 + 7 * (weekInYear - 1)); + return d; +} +export function getFirstMondayFromMonthWeek(weekInMonth: number, month = new Date().getMonth() + 1, year = new Date().getFullYear()) { + const d = new Date(year, month - 1, 4); + const day = d.getDay() || 7; + d.setDate(d.getDate() - day + 1); + d.setDate(d.getDate() + 7 * (weekInMonth - 1)); + return d; +} diff --git a/src/tools/week-number-converter/week-number-converter.vue b/src/tools/week-number-converter/week-number-converter.vue new file mode 100644 index 00000000..9dcdcf0a --- /dev/null +++ b/src/tools/week-number-converter/week-number-converter.vue @@ -0,0 +1,69 @@ + + +