From a9293b1257cb49aca6ed83b20fba0458b65cdce6 Mon Sep 17 00:00:00 2001 From: Tony Samperi Date: Fri, 6 Sep 2024 12:23:01 +0200 Subject: [PATCH] v5.0.6 * Documented weekSettings opt in DateTime (#1640) --- CHANGELOG.md | 6 ++++++ package.json | 2 +- src/datetime.ts | 50 ++++++++++++++++++++++++++++--------------------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7746547..50f5620 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 5.0.5 (Luxon next 3.5.0) +* Documented weekSettings opt in DateTime (#1640) + +## 5.0.5 (Luxon next 3.4.4) +* Fix package.json + ## 5.0.4 (Luxon next 3.4.4) * The extra "require" actually broke diff --git a/package.json b/package.json index f10502f..1ab55c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ts-luxon", - "version": "5.0.5", + "version": "5.0.6", "license": "MIT", "description": "Typescript version of the \"Immutable date wrapper\"", "author": "Tony Samperi", diff --git a/src/datetime.ts b/src/datetime.ts index de005b8..8fdb03a 100644 --- a/src/datetime.ts +++ b/src/datetime.ts @@ -874,6 +874,7 @@ export class DateTime { * @param {string} [opts.locale='en-US'] - a locale string to use when parsing. Will also set the DateTime to this locale * @param {string} opts.numberingSystem - the numbering system to use when parsing. Will also set the resulting DateTime to this numbering system * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance + * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance */ static fromFormat(text: string, fmt: string, opts: DateTimeOptions = {}): DateTime { if (isUndefined(text) || isUndefined(fmt)) { @@ -968,6 +969,7 @@ export class DateTime { * @param {string} [opts.locale="system's locale"] - a locale to set on the resulting DateTime instance * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance + * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance * @example DateTime.fromHTTP('Sun, 06 Nov 1994 08:49:37 GMT') * @example DateTime.fromHTTP('Sunday, 06-Nov-94 08:49:37 GMT') * @example DateTime.fromHTTP('Sun Nov 6 08:49:37 1994') @@ -987,6 +989,7 @@ export class DateTime { * @param {string} [opts.locale='system's locale'] - a locale to set on the resulting DateTime instance * @param {string} [opts.outputCalendar] - the output calendar to set on the resulting DateTime instance * @param {string} [opts.numberingSystem] - the numbering system to set on the resulting DateTime instance + * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance * @example DateTime.fromISO('2016-05-25T09:08:34.123') * @example DateTime.fromISO('2016-05-25T09:08:34.123+06:00') * @example DateTime.fromISO("2016-05-25T09:08:34.123+06:00", {setZone: true}) @@ -1033,6 +1036,7 @@ export class DateTime { * @param {string} [options.locale] - a locale to set on the resulting DateTime instance * @param {string} [options.outputCalendar] - the output calendar to set on the resulting DateTime instance * @param {string} [options.numberingSystem] - the numbering system to set on the resulting DateTime instance + * @param {string} [options.weekSettings] - the week settings to set on the resulting DateTime instance * @return {DateTime} */ static fromMillis(milliseconds: number, options: DateTimeOptions = {}): DateTime { @@ -1076,6 +1080,7 @@ export class DateTime { * @param {string} [opts.locale="system's locale"] - a locale to set on the resulting DateTime instance * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance + * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance * @example DateTime.fromObject({ year: 1982, month: 5, day: 25}).toISODate() //=> '1982-05-25' * @example DateTime.fromObject({ year: 1982 }).toISODate() //=> '1982-01-01' * @example DateTime.fromObject({ hour: 10, minute: 26, second: 6 }) //~> today at 10:26:06 @@ -1168,6 +1173,7 @@ export class DateTime { * @param {string} [opts.locale="system's locale"] - a locale to set on the resulting DateTime instance * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance * @param {string} opts.numberingSystem - the numbering system to set on the resulting DateTime instance + * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance * @example DateTime.fromRFC2822('25 Nov 2016 13:23:12 GMT') * @example DateTime.fromRFC2822('Fri, 25 Nov 2016 13:23:12 +0600') * @example DateTime.fromRFC2822('25 Nov 2016 13:23 Z') @@ -1187,6 +1193,7 @@ export class DateTime { * @param {string} [opts.locale='en-US'] - a locale string to use when parsing. Will also set the DateTime to this locale * @param {string} opts.numberingSystem - the numbering system to use when parsing. Will also set the resulting DateTime to this numbering system * @param {string} opts.outputCalendar - the output calendar to set on the resulting DateTime instance + * @param {string} opts.weekSettings - the week settings to set on the resulting DateTime instance * @example DateTime.fromSQL('2017-05-15') * @example DateTime.fromSQL('2017-05-15 09:12:34') * @example DateTime.fromSQL('2017-05-15 09:12:34.342') @@ -1210,6 +1217,7 @@ export class DateTime { * @param {string} [options.locale] - a locale to set on the resulting DateTime instance * @param {string} [options.outputCalendar] - the output calendar to set on the resulting DateTime instance * @param {string} [options.numberingSystem] - the numbering system to set on the resulting DateTime instance + * @param {string} [options.weekSettings] - the week settings to set on the resulting DateTime instance * @return {DateTime} */ static fromSeconds(seconds: number, options: DateTimeOptions = {}): DateTime { @@ -1362,27 +1370,27 @@ export class DateTime { /** * Create a DateTime in UTC - * @param args - The date values (year, month, etc.) and/or the configuration options for the DateTime - * @example {number} [year] - The calendar year. If omitted (as in, call `utc()` with no arguments), the current time will be used - * @example {number} [month=1] - The month, 1-indexed - * @example {number} [day=1] - The day of the month - * @example {number} [hour=0] - The hour of the day, in 24-hour time - * @example {number} [minute=0] - The minute of the hour, meaning a number between 0 and 59 - * @example {number} [second=0] - The second of the minute, meaning a number between 0 and 59 - * @example {number} [millisecond=0] - The millisecond of the second, meaning a number between 0 and 999 - * @example {Object} options - configuration options for the DateTime - * @example {string} [options.locale] - a locale to set on the resulting DateTime instance - * @example {string} [options.outputCalendar] - the output calendar to set on the resulting DateTime instance - * @example {string} [options.numberingSystem] - the numbering system to set on the resulting DateTime instance - * @example DateTime.utc() //~> now - * @example DateTime.utc(2017) //~> 2017-01-01T00:00:00Z - * @example DateTime.utc(2017, 3) //~> 2017-03-01T00:00:00Z - * @example DateTime.utc(2017, 3, 12) //~> 2017-03-12T00:00:00Z - * @example DateTime.utc(2017, 3, 12, 5) //~> 2017-03-12T05:00:00Z - * @example DateTime.utc(2017, 3, 12, 5, 45) //~> 2017-03-12T05:45:00Z - * @example DateTime.utc(2017, 3, 12, 5, 45, { locale: "fr" } ) //~> 2017-03-12T05:45:00Z with a French locale - * @example DateTime.utc(2017, 3, 12, 5, 45, 10) //~> 2017-03-12T05:45:10Z - * @example DateTime.utc(2017, 3, 12, 5, 45, 10, 765, { locale: "fr }) //~> 2017-03-12T05:45:10.765Z + * @param {number} [year] - The calendar year. If omitted (as in, call `utc()` with no arguments), the current time will be used + * @param {number} [month=1] - The month, 1-indexed + * @param {number} [day=1] - The day of the month + * @param {number} [hour=0] - The hour of the day, in 24-hour time + * @param {number} [minute=0] - The minute of the hour, meaning a number between 0 and 59 + * @param {number} [second=0] - The second of the minute, meaning a number between 0 and 59 + * @param {number} [millisecond=0] - The millisecond of the second, meaning a number between 0 and 999 + * @param {Object} options - configuration options for the DateTime + * @param {string} [options.locale] - a locale to set on the resulting DateTime instance + * @param {string} [options.outputCalendar] - the output calendar to set on the resulting DateTime instance + * @param {string} [options.numberingSystem] - the numbering system to set on the resulting DateTime instance + * @param {string} [options.weekSettings] - the week settings to set on the resulting DateTime instance + * @example DateTime.utc() //~> now + * @example DateTime.utc(2017) //~> 2017-01-01T00:00:00Z + * @example DateTime.utc(2017, 3) //~> 2017-03-01T00:00:00Z + * @example DateTime.utc(2017, 3, 12) //~> 2017-03-12T00:00:00Z + * @example DateTime.utc(2017, 3, 12, 5) //~> 2017-03-12T05:00:00Z + * @example DateTime.utc(2017, 3, 12, 5, 45) //~> 2017-03-12T05:45:00Z + * @example DateTime.utc(2017, 3, 12, 5, 45, { locale: "fr" }) //~> 2017-03-12T05:45:00Z with a French locale + * @example DateTime.utc(2017, 3, 12, 5, 45, 10) //~> 2017-03-12T05:45:10Z + * @example DateTime.utc(2017, 3, 12, 5, 45, 10, 765, { locale: "fr" }) //~> 2017-03-12T05:45:10.765Z with a French locale * @return {DateTime} */ static utc(...args: [DateTimeOptions] | number[] | (number | DateTimeOptions)[]): DateTime {