From 04a2d680cf51bb50dcc2e3eb6f8a379ab8ffdfb5 Mon Sep 17 00:00:00 2001 From: Sasha Koss Date: Fri, 28 May 2021 19:58:59 +0800 Subject: [PATCH] Fix constants typings generation bug (closes #2491) Fixed constant typings. --- src/constants/index.ts | 99 +++++++++++++++++++++++------------------- src/fp/index.js.flow | 4 +- src/index.js.flow | 6 +-- typings.d.ts | 30 ++++++------- 4 files changed, 75 insertions(+), 64 deletions(-) diff --git a/src/constants/index.ts b/src/constants/index.ts index 8774764232..fc643b805b 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -1,45 +1,50 @@ /** - * Days in 1 week. + * Days in 1 week. * - * @constant - * @type {number} - * @default + * @name daysInWeek + * @constant + * @type {number} + * @default */ export const daysInWeek = 7 /** - * Maximum allowed time. + * Maximum allowed time. * - * @constant - * @type {number} - * @default + * @name maxTime + * @constant + * @type {number} + * @default */ export const maxTime = Math.pow(10, 8) * 24 * 60 * 60 * 1000 /** - * Milliseconds in 1 minute + * Milliseconds in 1 minute * - * @constant - * @type {number} - * @default + * @name millisecondsInMinute + * @constant + * @type {number} + * @default */ export const millisecondsInMinute = 60000 /** - * Milliseconds in 1 hour + * Milliseconds in 1 hour * - * @constant - * @type {number} - * @default + * @name millisecondsInHour + * @constant + * @type {number} + * @default */ export const millisecondsInHour = 3600000 /** - * Milliseconds in 1 second + * Milliseconds in 1 second * - * @constant - * @type {number} - * @default + * @name millisecondsInSecond + * @constant + * @type {number} + * @default */ export const millisecondsInSecond = 1000 @@ -54,55 +59,61 @@ export const millisecondsInSecond = 1000 export const minTime = -maxTime /** - * Minutes in 1 hour + * Minutes in 1 hour * - * @constant - * @type {number} - * @default + * @name minutesInHour + * @constant + * @type {number} + * @default */ export const minutesInHour = 60 /** - * Months in 1 quarter + * Months in 1 quarter * - * @constant - * @type {number} - * @default + * @name monthsInQuarter + * @constant + * @type {number} + * @default */ export const monthsInQuarter = 3 /** - * Months in 1 year + * Months in 1 year * - * @constant - * @type {number} - * @default + * @name monthsInYear + * @constant + * @type {number} + * @default */ export const monthsInYear = 12 /** - * Quarters in 1 year + * Quarters in 1 year * - * @constant - * @type {number} - * @default + * @name quartersInYear + * @constant + * @type {number} + * @default */ export const quartersInYear = 4 /** - * Seconds in 1 hour + * Seconds in 1 hour * - * @constant - * @type {number} - * @default + * @name secondsInHour + * @constant + * @type {number} + * @default */ export const secondsInHour = 3600 /** - * Seconds in 1 minute + * Seconds in 1 minute * - * @constant - * @type {number} - * @default + * @name secondsInMinute + * @constant + * @type {number} + * @default */ export const secondsInMinute = 60 diff --git a/src/fp/index.js.flow b/src/fp/index.js.flow index 718d496cd2..1db8a1df96 100644 --- a/src/fp/index.js.flow +++ b/src/fp/index.js.flow @@ -611,15 +611,15 @@ declare module.exports: { yearsToMonths: CurriedFn1, yearsToQuarters: CurriedFn1, daysInWeek: number, - daysInWeek: number, maxTime: number, millisecondsInMinute: number, millisecondsInHour: number, - minTime: number, + millisecondsInSecond: number, minTime: number, minutesInHour: number, monthsInQuarter: number, monthsInYear: number, quartersInYear: number, secondsInHour: number, + secondsInMinute: number, } diff --git a/src/index.js.flow b/src/index.js.flow index 6bca432fb2..46beda918d 100644 --- a/src/index.js.flow +++ b/src/index.js.flow @@ -836,15 +836,13 @@ declare module.exports: { daysInWeek: number, - daysInWeek: number, - maxTime: number, millisecondsInMinute: number, millisecondsInHour: number, - minTime: number, + millisecondsInSecond: number, minTime: number, @@ -857,4 +855,6 @@ declare module.exports: { quartersInYear: number, secondsInHour: number, + + secondsInMinute: number, } diff --git a/typings.d.ts b/typings.d.ts index a4326b1a09..f80022cd51 100644 --- a/typings.d.ts +++ b/typings.d.ts @@ -1130,15 +1130,13 @@ declare module 'date-fns' { const daysInWeek: number - const daysInWeek: number - const maxTime: number const millisecondsInMinute: number const millisecondsInHour: number - const minTime: number + const millisecondsInSecond: number const minTime: number @@ -1151,6 +1149,8 @@ declare module 'date-fns' { const quartersInYear: number const secondsInHour: number + + const secondsInMinute: number } declare module 'date-fns/add' { @@ -5597,15 +5597,13 @@ declare module 'date-fns/fp' { const daysInWeek: number - const daysInWeek: number - const maxTime: number const millisecondsInMinute: number const millisecondsInHour: number - const minTime: number + const millisecondsInSecond: number const minTime: number @@ -5618,6 +5616,8 @@ declare module 'date-fns/fp' { const quartersInYear: number const secondsInHour: number + + const secondsInMinute: number } declare module 'date-fns/fp/add' { @@ -10230,15 +10230,13 @@ declare module 'date-fns/esm' { const daysInWeek: number - const daysInWeek: number - const maxTime: number const millisecondsInMinute: number const millisecondsInHour: number - const minTime: number + const millisecondsInSecond: number const minTime: number @@ -10251,6 +10249,8 @@ declare module 'date-fns/esm' { const quartersInYear: number const secondsInHour: number + + const secondsInMinute: number } declare module 'date-fns/esm/add' { @@ -14697,15 +14697,13 @@ declare module 'date-fns/esm/fp' { const daysInWeek: number - const daysInWeek: number - const maxTime: number const millisecondsInMinute: number const millisecondsInHour: number - const minTime: number + const millisecondsInSecond: number const minTime: number @@ -14718,6 +14716,8 @@ declare module 'date-fns/esm/fp' { const quartersInYear: number const secondsInHour: number + + const secondsInMinute: number } declare module 'date-fns/esm/fp/add' { @@ -22012,15 +22012,13 @@ interface dateFns { daysInWeek: number - daysInWeek: number - maxTime: number millisecondsInMinute: number millisecondsInHour: number - minTime: number + millisecondsInSecond: number minTime: number @@ -22033,4 +22031,6 @@ interface dateFns { quartersInYear: number secondsInHour: number + + secondsInMinute: number }