Fix OptionType signature to accept format

iamkun · Feb 22, 2019 · 0bb72c6 · 0bb72c6
1 parent 1051814
commit 0bb72c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/test/index.d.test.ts b/test/index.d.test.ts
@@ -8,6 +8,12 @@ dayjs(730944000000)
 
 dayjs(new Date(1993, 3, 1))
 
+dayjs('05/02/69 1:02:03 PM -05:00', 'MM/DD/YY H:mm:ss A Z')
+
+dayjs('05/02/69 1:02:03 PM -05:00', { format: 'MM/DD/YY H:mm:ss A Z' })
+
+dayjs('1993-03-1', { locale: 'ja' })
+
 dayjs().clone()
 
 dayjs().isValid()

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -7,7 +7,7 @@ declare namespace dayjs {
   /** @deprecated Renamed to DateType. */
   export type ConfigType = DateType
 
-  export type OptionType = { locale: string }
+  export type OptionType = { locale?: string, format?: string } | string
 
   type UnitTypeShort = 'd' | 'M' | 'y' | 'h' | 'm' | 's' | 'ms'
   export type UnitType = 'millisecond' | 'second' | 'minute' | 'hour' | 'day' | 'month' | 'quarter' | 'year' | 'date' | UnitTypeShort;