@@ -1,39 +1,44 @@
1−module Data.Intl.DateTimeFormat
1+module Data.Intl.DateTimeFormat
22 ( LocalesOption
33 , LocaleMatcher(..)
44 , TimeZone(..)
55 , FormatMatcher(..)
6+ , WeekdayYearMonthDayHourMinuteSecond(..)
7+ , WeekdayYearMonthDay(..)
8+ , YearMonthDay(..)
9+ , YearMonth(..)
10+ , MonthDay(..)
11+ , HourMinuteSecond(..)
12+ , HourMinute(..)
13+ , Undefined
14+ , undefined
615 , DateTimeFormatOptions(..)
716 , DateTimeFormatOptions'
817 , DateTimeComponents(..)
9− , DateTimeFormat
10− , createDateTimeFormat
18+ , DateTimeFormatter
19+ , createDateTimeFormatter
1120 , formatJSDate
1221 , module Data.Intl.DateTimeFormat.Types
13− , supportedLocalesOf
14− , formatToParts
15− , resolvedOptions
1622 ) where
1723
1824import Data.Intl.DateTimeFormat.Types
1925
20−import Control.Monad.Error.Class (throwError)
21−import Data.Either (Either(..))
22−import Data.Foreign (F, Foreign, ForeignError(..), isUndefined, readString)
23−import Data.Foreign.Index ((!))
24−import Data.Function.Uncurried (Fn3, Fn4, runFn3, runFn4)
25−import Data.Intl.DateTimeFormat.Class (class FormatComponent, FormatComponentRecord(FormatComponentRecord), formatComponent)
26+import Data.Generic.Rep (class Generic)
27+import Data.Intl.DateTimeFormat.Generic (class FormatComponent, defaultComponentRecord, formatComponent, genericFormatComponent)
2628import Data.JSDate (JSDate)
27−import Data.Maybe (Maybe(..), fromMaybe, maybe)
28−import Data.Newtype (class Newtype, un)
29+import Data.Maybe (Maybe, fromMaybe, maybe)
30+import Data.Newtype (class Newtype)
2931import Data.StrMap (union)
3032import Data.Symbol (SProxy(..))
31−import Data.Traversable (sequence)
32−import Data.Variant (Variant, case_, default, on)
33−import Prelude (class Eq, class Show, Unit, bind, id, pure, show, (#), ($), (<$>), (<<<), (>>=))
33+import Data.Variant (Variant, default, on)
34+import Prelude (class Eq, class Show, Unit, id, show, (#), ($))
3435import Unsafe.Coerce (unsafeCoerce)
3536
3637foreign import data LocalesOption' :: Type
38+foreign import data DateTimeFormat :: Type
39+
40+foreign import data Undefined :: Type
41+foreign import undefined :: Undefined
3742
3843foreign import dateTimeFormatImpl :: LocalesOption' -> DateTimeFormatOptions_ -> DateTimeFormat
3944
@@ -86,6 +91,85 @@ instance showFormatMatcher :: Show FormatMatcher where
8691 show FMBasic = "basic"
8792 show FMBestFit = "best fit"
8893
94+newtype WeekdayYearMonthDayHourMinuteSecond = WeekdayYearMonthDayHourMinuteSecond
95+ { weekday :: StringRep
96+ , year :: NumericRep
97+ , month :: MonthRep
98+ , day :: NumericRep
99+ , hour :: NumericRep
100+ , minute :: NumericRep
101+ , second :: NumericRep
102+ }
103+
104+derive instance genericWeekdayYearMonthDayHourMinuteSecond :: Generic WeekdayYearMonthDayHourMinuteSecond _
105+
106+instance formatComponentWeekdayYearMonthDayHourMinuteSecond :: FormatComponent WeekdayYearMonthDayHourMinuteSecond where
107+ formatComponent = genericFormatComponent
108+
109+newtype WeekdayYearMonthDay = WeekdayYearMonthDay
110+ { weekday :: StringRep
111+ , year :: NumericRep
112+ , month :: MonthRep
113+ , day :: NumericRep
114+ }
115+
116+derive instance genericWeekdayYearMonthDay :: Generic WeekdayYearMonthDay _
117+
118+instance formatComponentWeekdayYearMonthDay :: FormatComponent WeekdayYearMonthDay where
119+ formatComponent = genericFormatComponent
120+
121+newtype YearMonthDay = YearMonthDay
122+ { year :: NumericRep
123+ , month :: MonthRep
124+ , day :: NumericRep
125+ }
126+
127+derive instance genericYearMonthDay :: Generic YearMonthDay _
128+
129+instance formatComponentYearMonthDay :: FormatComponent YearMonthDay where
130+ formatComponent = genericFormatComponent
131+
132+newtype YearMonth = YearMonth
133+ { year :: NumericRep
134+ , month :: MonthRep
135+ }
136+
137+derive instance genericYearMonth :: Generic YearMonth _
138+
139+instance formatComponentYearMonth :: FormatComponent YearMonth where
140+ formatComponent = genericFormatComponent
141+
142+newtype MonthDay = MonthDay
143+ { month :: MonthRep
144+ , day :: NumericRep
145+ }
146+
147+derive instance genericMonthDay :: Generic MonthDay _
148+
149+instance formatComponentMonthDay :: FormatComponent MonthDay where
150+ formatComponent = genericFormatComponent
151+
152+newtype HourMinuteSecond = HourMinuteSecond
153+ { hour :: NumericRep
154+ , minute :: NumericRep
155+ , second :: NumericRep
156+ }
157+
158+derive instance genericHourMinuteSecond :: Generic HourMinuteSecond _
159+
160+instance formatComponentHourMinuteSecond :: FormatComponent HourMinuteSecond where
161+ formatComponent = genericFormatComponent
162+
163+newtype HourMinute = HourMinute
164+ { hour :: NumericRep
165+ , minute :: NumericRep
166+ }
167+
168+derive instance genericHourMinute :: Generic HourMinute _
169+
170+instance formatComponentHourMinute :: FormatComponent HourMinute where
171+ formatComponent = genericFormatComponent
172+
89173type DateTimeComponents a =
90174 Variant
91175 ( weekdayYearMonthDayHourMinuteSecond :: WeekdayYearMonthDayHourMinuteSecond
@@ -120,7 +204,7 @@ formatDateTimeOptions (DateTimeFormatOptions opts comps) = merge opts' (compsCoe
120204 , hour12: fromMaybe (unsafeCoerce undefined) opts.hour12
121205 , formatMatcher: maybe undefinedString show opts.formatMatcher
122206 }
123− comps' = un FormatComponentRecord $ case_
207+ comps' = default (defaultComponentRecord)
124208 # on (SProxy :: SProxy "weekdayYearMonthDayHourMinuteSecond") formatComponent
125209 # on (SProxy :: SProxy "weekdayYearMonthDay") formatComponent
126210 # on (SProxy :: SProxy "yearMonthDay") formatComponent
@@ -186,158 +270,19 @@ formatDateTimeOptions (DateTimeFormatOptions opts comps) = merge opts' (compsCoe
186270 -> DateTimeFormatOptions_
187271 merge a b = unsafeCoerce $ union (unsafeCoerce a) (unsafeCoerce b)
188272
189−foreign import data DateTimeFormat :: Type
273+foreign import data DateTimeFormatter :: Type
274+
275+foreign import createDateTimeFormatterImpl
276+ :: LocalesOption'
277+ -> DateTimeFormatOptions_
278+ -> DateTimeFormatter
190279
191−foreign import createDateTimeFormatImpl
192− :: Fn4
193− (forall a. String -> F a)
194− (forall a. a -> F a)
195− LocalesOption'
196− DateTimeFormatOptions_
197− (F DateTimeFormat)
198−
199−-- | Examples
200−-- | ``` purescript
201−-- | import Data.Variant (inj)
202−-- |
203−-- | fmtHourMinute = F DateTimeFormat
204−-- | fmtHourMinute = createDateTimeFormat locale opts
205−-- | where
206−-- | locale = inj (SProxy :: SProxy "locale") "en-GB"
207−-- | opts = (DateTimeFormatOptions
208−-- | { localeMatcher: Nothing
209−-- | , timeZone: (Just (TimeZone "Europe/London"))
210−-- | , hour12: Just false
211−-- | , formatMatcher: Nothing
212−-- | }
213−-- | (inj (SProxy :: SProxy "hourMinute")
214−-- | (HourMinute {hour: TwoDigit, minute: TwoDigit}))
215−-- |
216−-- |
217−-- | fmtDate :: F DateTimeFormat
218−-- | fmtDate = createDateTimeFormat locale opts
219−-- | wher
220−-- | locale = inj (SProxy :: SProxy "locale") "en-GB"
221−-- | opts :: DateTimeFormatOptions'
222−-- | opts =
223−-- | (DateTimeFormatOptions
224−-- | { localeMatcher: Nothing
225−-- | , timeZone: (Just (TimeZone "Europe/London"))
226−-- | , hour12: Just true
227−-- | , formatMatcher: Nothing
228−-- | }
229−-- | (inj
230−-- | (SProxy :: SProxy "weekdayYearMonthDayHourMinuteSecond")
231−-- | (WeekdayYearMonthDayHourMinuteSecond
232−-- | { weekday: Short
233−-- | , year: Numeric
234−-- | , month: MonthLong
235−-- | , day: Numeric
236−-- | , hour: Numeric
237−-- | , minute: Numeric
238−-- | , second: Numeric
239−-- | }
240−-- | )
241−-- | )
242−-- | )
243−-- | ```
244−-- | You have predifined types: `WeekdayYearMonthDayHourMinuteSecond`,
245−-- | `WeekdayYearMonthDay`, `YearMonthDay`, `YearMonth`, `MonthDay`,
246−-- | `HourMinuteSecond`, `HourMinute`. But you can also provide your own by
247−-- | implementing `FormatComponent` class (or by deriving it), e.g.
248−-- | ``` purescript
249−-- | newtype EraYear = EraYear
250−-- | { era :: StringRep
251−-- | , year :: NumericRep
252−-- | }
253−-- |
254−-- | derive instance genericEraYear :: Generic EraYear _
255−-- |
256−-- | instance formatComponentEraYear :: FormatComponent EraYear where
257−-- | formatComponent = genericFormatComponent
258−-- |
259−-- | fmtEraYear :: F DateTimeFormat
260−-- | fmtEraYear = createDateTimeFormat locales opts
261−-- | where
262−-- | locale = inj (SProxy :: SProxy "locale") "en-GB"
263−-- | opts :: DateTimeFormatOptions EraYear
264−-- | opts =
265−-- | (DateTimeFormatOptions
266−-- | { localeMatcher: Nothing
267−-- | , timeZone: (Just (TimeZone "Europe/London"))
268−-- | , hour12: Just true
269−-- | , formatMatcher: Nothing
270−-- | }
271−-- | (inj
272−-- | (SProxy :: SProxy "custom")
273−-- | (EraYear
274−-- | { era: Long
275−-- | , year: Numeric
276−-- | }
277−-- | )
278−-- | )
279−-- | )
280−-- | ```
281−createDateTimeFormat
280+createDateTimeFormatter
282281 :: forall a
283282 .(FormatComponent a)
284283 => LocalesOption
285284 -> DateTimeFormatOptions a
286− -> F DateTimeFormat
287−createDateTimeFormat ls opts =
288− runFn4 createDateTimeFormatImpl
289− (throwError <<< pure <<< ForeignError)
290− pure
291− (toLocale ls)
292− (formatDateTimeOptions opts)
293−
294−-- | Examples
295−-- | ``` purescript
296−-- | formatJSDate (either (const "") id $ runExcept fmtHourMinute) date -- "12:00"
297−-- | formatJSDate (either (const "") id $ fmtDate) date -- "Tue, January 2, 2018, 12:00:00 PM"
298−-- | formatJSDate (either (const "") id $ fmtEraYear) date -- "2018 Anno Domini"
299−-- | ```
300−foreign import formatJSDate :: DateTimeFormat -> JSDate -> String
301−
302−foreign import supportedLocalesOfImpl
303− :: Fn3
304− (String -> Either String (Array String))
305− (Array String -> Either String (Array String))
306− (Array String)
307− (Either String (Array String))
308−
309−foreign import formatToPartsImpl :: DateTimeFormat -> JSDate -> Array Foreign
310−
311−formatToParts :: DateTimeFormat -> JSDate -> F (Array FormatParts)
312−formatToParts formatter date = sequence $ readFormatParts <$> formatToPartsImpl formatter date
313−
314−supportedLocalesOf :: Array String -> Either String (Array String)
315−supportedLocalesOf locales = runFn3 supportedLocalesOfImpl Left Right locales
316−
317−foreign import resolvedOptionsImpl :: DateTimeFormat -> Foreign
318−
319−resolvedOptions :: DateTimeFormat -> F ResolvedOptions
320−resolvedOptions fmt = do
321− locale <- obj ! "locale" >>= readString
322− calendar <- obj ! "calendar" >>= readString
323− numberingSystem <- obj ! "numberingSystem" >>= readString
324− timeZone <- obj ! "timeZone" >>= readString
325− era <- obj ! "era" >>= readMaybeString
326− weekday <- obj ! "weekday" >>= readMaybeString
327− year <- obj ! "year" >>= readMaybeString
328− day <- obj ! "day" >>= readMaybeString
329− hour <- obj ! "hour" >>= readMaybeString
330− minute <- obj ! "minute" >>= readMaybeString
331− second <- obj ! "second" >>= readMaybeString
332− timeZoneName <- obj ! "timeZoneName" >>= readMaybeString
333−
334− pure $ ResolvedOptions { locale, calendar, numberingSystem, timeZone, era, weekday, year, day, hour, minute, second, timeZoneName }
335−
336− where
337− obj = resolvedOptionsImpl fmt
285+ -> DateTimeFormatter
286+createDateTimeFormatter ls opts = createDateTimeFormatterImpl (toLocale ls) (formatDateTimeOptions opts)
338287
339− readMaybeString :: Foreign -> F (Maybe String)
340− readMaybeString f =
341− if isUndefined f
342− then pure Nothing
343− else Just <$> readString f
288+foreign import formatJSDate :: DateTimeFormatter -> JSDate -> String