git.iko.soy/purescript-intl
on master help sign in
10 files changed+511−190
since splitsnapshots
unifiedsplit
.travis.yml+1−1 README.md+1−1 bower.json+1−1 src/Data/Intl/DateTimeFormat.js+16−6 src/Data/Intl/DateTimeFormat.purs+163−116 src/Data/Intl/DateTimeFormat/Class.purs+41 src/Data/Intl/DateTimeFormat/Generic.purs+5−39 src/Data/Intl/DateTimeFormat/Types.js+3 src/Data/Intl/DateTimeFormat/Types.purs+216−2 test/Test/Main.purs+64−24
.travis.yml+1−1
@@ -16,7 +16,7 @@ script:
1616 - bower install --production
1717 - npm run -s build
1818 - bower install
19− - LC_TIME="en_GB.UTF-8" npm -s test
19+ - npm -s test
2020after_success:
2121- >-
2222 test $TRAVIS_TAG &&
README.md+1−1
@@ -1,7 +1,7 @@
11# PureScript bindings to Intl - JavaScript Internalisation API
22
33[![Maintainer: coot](https://img.shields.io/badge/maintainer-coot-lightgrey.svg)](http://github.com/coot)
4−[![documentation](https://pursuit.purescript.org/packages/purescript-intl/badge)](https://pursuit.purescript.org/packages/purescript-intl)
4+[![Documentation](https://pursuit.purescript.org/packages/purescript-intl/badge)](https://pursuit.purescript.org/packages/purescript-intl)
55[![Build Status](https://travis-ci.org/coot/purescript-intl.svg?branch=master)](https://travis-ci.org/coot/purescript-intl)
66
77[Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl)
bower.json+1−1
@@ -9,7 +9,7 @@
99 "license": "MPL-2.0",
1010 "repository": {
1111 "type": "git",
12− "url": "git://github.com/purescript/purescript-prelude.git"
12+ "url": "git://github.com/coot/purescript-intl.git"
1313 },
1414 "dependencies": {
1515 "purescript-prelude": "^3.0.0",
src/Data/Intl/DateTimeFormat.js+16−6
@@ -1,17 +1,17 @@
11"use strict";
22
3−exports["undefined"] = undefined;
4−
53exports.dateTimeFormatImpl = function(locales) {
64 return function(options) {
75 return new Intl.DateTimeFormat(locales, options);
86 };
97};
108
11−exports.createDateTimeFormatterImpl = function(locales) {
12− return function(opts) {
13− return Intl.DateTimeFormat(locales, opts);
14− };
9+exports.createDateTimeFormatImpl = function(throwError, pure, locales, opts) {
10+ try {
11+ return pure(Intl.DateTimeFormat(locales, opts));
12+ } catch (e) {
13+ return throwError(e.message);
14+ }
1515};
1616
1717exports.formatJSDate = function(formatter) {
@@ -20,6 +20,12 @@ exports.formatJSDate = function(formatter) {
2020 };
2121};
2222
23+exports.formatToPartsImpl = function(formatter) {
24+ return function(date) {
25+ return formatter.formatToParts(date);
26+ };
27+};
28+
2329exports.supportedLocalesOfImpl = function(Left, Right, locales) {
2430 try {
2531 return Right(Intl.DateTimeFormat.supportedLocalesOf(locales))
@@ -27,3 +33,7 @@ exports.supportedLocalesOfImpl = function(Left, Right, locales) {
2733 return Left(e.message)
2834 }
2935}
36+
37+exports.resolvedOptionsImpl = function(formatter) {
38+ return formatter.resolvedOptions();
39+};
src/Data/Intl/DateTimeFormat.purs+163−116
@@ -1,47 +1,39 @@
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
156 , DateTimeFormatOptions(..)
167 , DateTimeFormatOptions'
178 , DateTimeComponents(..)
18− , DateTimeFormatter
19− , createDateTimeFormatter
9+ , DateTimeFormat
10+ , createDateTimeFormat
2011 , formatJSDate
2112 , module Data.Intl.DateTimeFormat.Types
2213 , supportedLocalesOf
14+ , formatToParts
15+ , resolvedOptions
2316 ) where
2417
2518import Data.Intl.DateTimeFormat.Types
2619
20+import Control.Monad.Error.Class (throwError)
2721import Data.Either (Either(..))
28−import Data.Function.Uncurried (Fn3, runFn3)
29−import Data.Generic.Rep (class Generic)
30−import Data.Intl.DateTimeFormat.Generic (class FormatComponent, defaultComponentRecord, formatComponent, genericFormatComponent)
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)
3126import Data.JSDate (JSDate)
32−import Data.Maybe (Maybe, fromMaybe, maybe)
33−import Data.Newtype (class Newtype)
27+import Data.Maybe (Maybe(..), fromMaybe, maybe)
28+import Data.Newtype (class Newtype, un)
3429import Data.StrMap (union)
3530import Data.Symbol (SProxy(..))
36−import Data.Variant (Variant, default, on)
37−import Prelude (class Eq, class Show, Unit, id, show, (#), ($))
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, (#), ($), (<$>), (<<<), (>>=))
3834import Unsafe.Coerce (unsafeCoerce)
3935
4036foreign import data LocalesOption' :: Type
41−foreign import data DateTimeFormat :: Type
42−
43−foreign import data Undefined :: Type
44−foreign import undefined :: Undefined
4537
4638foreign import dateTimeFormatImpl :: LocalesOption' -> DateTimeFormatOptions_ -> DateTimeFormat
4739
@@ -94,85 +86,6 @@ instance showFormatMatcher :: Show FormatMatcher where
9486 show FMBasic = "basic"
9587 show FMBestFit = "best fit"
9688
97−newtype WeekdayYearMonthDayHourMinuteSecond = WeekdayYearMonthDayHourMinuteSecond
98− { weekday :: StringRep
99− , year :: NumericRep
100− , month :: MonthRep
101− , day :: NumericRep
102− , hour :: NumericRep
103− , minute :: NumericRep
104− , second :: NumericRep
105− }
106−
107−derive instance genericWeekdayYearMonthDayHourMinuteSecond :: Generic WeekdayYearMonthDayHourMinuteSecond _
108−
109−instance formatComponentWeekdayYearMonthDayHourMinuteSecond :: FormatComponent WeekdayYearMonthDayHourMinuteSecond where
110− formatComponent = genericFormatComponent
111−
112−newtype WeekdayYearMonthDay = WeekdayYearMonthDay
113− { weekday :: StringRep
114− , year :: NumericRep
115− , month :: MonthRep
116− , day :: NumericRep
117− }
118−
119−derive instance genericWeekdayYearMonthDay :: Generic WeekdayYearMonthDay _
120−
121−instance formatComponentWeekdayYearMonthDay :: FormatComponent WeekdayYearMonthDay where
122− formatComponent = genericFormatComponent
123−
124−newtype YearMonthDay = YearMonthDay
125− { year :: NumericRep
126− , month :: MonthRep
127− , day :: NumericRep
128− }
129−
130−derive instance genericYearMonthDay :: Generic YearMonthDay _
131−
132−instance formatComponentYearMonthDay :: FormatComponent YearMonthDay where
133− formatComponent = genericFormatComponent
134−
135−newtype YearMonth = YearMonth
136− { year :: NumericRep
137− , month :: MonthRep
138− }
139−
140−derive instance genericYearMonth :: Generic YearMonth _
141−
142−instance formatComponentYearMonth :: FormatComponent YearMonth where
143− formatComponent = genericFormatComponent
144−
145−newtype MonthDay = MonthDay
146− { month :: MonthRep
147− , day :: NumericRep
148− }
149−
150−derive instance genericMonthDay :: Generic MonthDay _
151−
152−instance formatComponentMonthDay :: FormatComponent MonthDay where
153− formatComponent = genericFormatComponent
154−
155−newtype HourMinuteSecond = HourMinuteSecond
156− { hour :: NumericRep
157− , minute :: NumericRep
158− , second :: NumericRep
159− }
160−
161−derive instance genericHourMinuteSecond :: Generic HourMinuteSecond _
162−
163−instance formatComponentHourMinuteSecond :: FormatComponent HourMinuteSecond where
164− formatComponent = genericFormatComponent
165−
166−newtype HourMinute = HourMinute
167− { hour :: NumericRep
168− , minute :: NumericRep
169− }
170−
171−derive instance genericHourMinute :: Generic HourMinute _
172−
173−instance formatComponentHourMinute :: FormatComponent HourMinute where
174− formatComponent = genericFormatComponent
175−
17689type DateTimeComponents a =
17790 Variant
17891 ( weekdayYearMonthDayHourMinuteSecond :: WeekdayYearMonthDayHourMinuteSecond
@@ -207,7 +120,7 @@ formatDateTimeOptions (DateTimeFormatOptions opts comps) = merge opts' (compsCoe
207120 , hour12: fromMaybe (unsafeCoerce undefined) opts.hour12
208121 , formatMatcher: maybe undefinedString show opts.formatMatcher
209122 }
210− comps' = default (defaultComponentRecord)
123+ comps' = un FormatComponentRecord $ case_
211124 # on (SProxy :: SProxy "weekdayYearMonthDayHourMinuteSecond") formatComponent
212125 # on (SProxy :: SProxy "weekdayYearMonthDay") formatComponent
213126 # on (SProxy :: SProxy "yearMonthDay") formatComponent
@@ -273,24 +186,158 @@ formatDateTimeOptions (DateTimeFormatOptions opts comps) = merge opts' (compsCoe
273186 -> DateTimeFormatOptions_
274187 merge a b = unsafeCoerce $ union (unsafeCoerce a) (unsafeCoerce b)
275188
276−foreign import data DateTimeFormatter :: Type
277−
278−foreign import createDateTimeFormatterImpl
279− :: LocalesOption'
280− -> DateTimeFormatOptions_
281− -> DateTimeFormatter
189+foreign import data DateTimeFormat :: Type
282190
283−createDateTimeFormatter
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
284282 :: forall a
285283 .(FormatComponent a)
286284 => LocalesOption
287285 -> DateTimeFormatOptions a
288− -> DateTimeFormatter
289−createDateTimeFormatter ls opts = createDateTimeFormatterImpl (toLocale ls) (formatDateTimeOptions opts)
290−
291−foreign import formatJSDate :: DateTimeFormatter -> JSDate -> String
292−
293−foreign import supportedLocalesOfImpl :: Fn3 (String -> Either String (Array String)) (Array String -> Either String (Array String)) (Array String) (Either String (Array String))
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
294313
295314supportedLocalesOf :: Array String -> Either String (Array String)
296315supportedLocalesOf 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
338+
339+ readMaybeString :: Foreign -> F (Maybe String)
340+ readMaybeString f =
341+ if isUndefined f
342+ then pure Nothing
343+ else Just <$> readString f
src/Data/Intl/DateTimeFormat/Class.pursnew file+41
@@ -0,0 +1,41 @@
1+module Data.Intl.DateTimeFormat.Class where
2+
3+import Data.Maybe (Maybe(..))
4+import Data.Newtype (class Newtype)
5+import Prelude (class Eq, Unit)
6+
7+newtype FormatComponentRecord = FormatComponentRecord
8+ { era :: Maybe String
9+ , weekday :: Maybe String
10+ , year :: Maybe String
11+ , month :: Maybe String
12+ , day :: Maybe String
13+ , hour :: Maybe String
14+ , minute :: Maybe String
15+ , second :: Maybe String
16+ , timeZoneName :: Maybe String
17+ }
18+
19+derive instance newtypeFormatComponentRecord :: Newtype FormatComponentRecord _
20+
21+derive instance eqFormatComponentRecord :: Eq FormatComponentRecord
22+
23+defaultComponentRecord :: FormatComponentRecord
24+defaultComponentRecord = FormatComponentRecord
25+ { era: Nothing
26+ , weekday: Nothing
27+ , year: Nothing
28+ , month: Nothing
29+ , day: Nothing
30+ , hour: Nothing
31+ , minute: Nothing
32+ , second: Nothing
33+ , timeZoneName: Nothing
34+ }
35+
36+
37+class FormatComponent a where
38+ formatComponent :: a -> FormatComponentRecord
39+
40+instance unitFormatComponent :: FormatComponent Unit where
41+ formatComponent _ = defaultComponentRecord
src/Data/Intl/DateTimeFormat/Generic.purs+5−39
@@ -1,51 +1,17 @@
11module Data.Intl.DateTimeFormat.Generic
2− ( class FormatComponent
3− , formatComponent
4− , class GenericFormatComponent
2+ ( class GenericFormatComponent
53 , genericFormatComponent'
64 , genericFormatComponent
75 , class GenericFormatComponentFields
86 , genericFormatComponentFields
9− , defaultComponentRecord
10− , FormatComponentRecord
117 ) where
128
139import Data.Generic.Rep (class Generic, Constructor(Constructor), Field(..), NoConstructors, Product(..), Rec(..), from)
10+import Data.Intl.DateTimeFormat.Class (FormatComponentRecord(..))
1411import Data.Intl.DateTimeFormat.Types (MonthRep, NumericRep, TimeZoneNameRep, StringRep)
1512import Data.Maybe (Maybe(..))
1613import Data.StrMap (StrMap, lookup, singleton, union)
17−import Prelude (Unit, show)
18−
19−type FormatComponentRecord =
20− { era :: Maybe String
21− , weekday :: Maybe String
22− , year :: Maybe String
23− , month :: Maybe String
24− , day :: Maybe String
25− , hour :: Maybe String
26− , minute :: Maybe String
27− , second :: Maybe String
28− , timeZoneName :: Maybe String
29− }
30−
31−defaultComponentRecord :: FormatComponentRecord
32−defaultComponentRecord =
33− { era: Nothing
34− , weekday: Nothing
35− , year: Nothing
36− , month: Nothing
37− , day: Nothing
38− , hour: Nothing
39− , minute: Nothing
40− , second: Nothing
41− , timeZoneName: Nothing
42− }
43−
44−class FormatComponent a where
45− formatComponent :: a -> FormatComponentRecord
46−
47−instance unitFormatComponent :: FormatComponent Unit where
48− formatComponent _ = defaultComponentRecord
14+import Prelude (show)
4915
5016class GenericFormatComponent a where
5117 genericFormatComponent' :: a -> FormatComponentRecord
@@ -54,7 +20,7 @@ class GenericFormatComponentFields a where
5420 genericFormatComponentFields :: a -> StrMap String
5521
5622instance genericFormatComponentNoConsturctors :: GenericFormatComponent NoConstructors where
57− genericFormatComponent' a =
23+ genericFormatComponent' a = FormatComponentRecord
5824 { era: Nothing
5925 , weekday: Nothing
6026 , year: Nothing
@@ -114,7 +80,7 @@ instance genericFormatComponentFieldsProduct
11480instance genericFormatComponentRec
11581 :: (GenericFormatComponentFields a)
11682 => GenericFormatComponent (Rec a) where
117− genericFormatComponent' (Rec a) =
83+ genericFormatComponent' (Rec a) = FormatComponentRecord
11884 { era: "era" `lookup` u
11985 , weekday: "weekday" `lookup` u
12086 , year: "year" `lookup` u
src/Data/Intl/DateTimeFormat/Types.jsnew file+3
@@ -0,0 +1,3 @@
1+"use strict";
2+
3+exports["undefined"] = undefined;
src/Data/Intl/DateTimeFormat/Types.purs+216−2
@@ -1,9 +1,37 @@
1−module Data.Intl.DateTimeFormat.Types where
1+module Data.Intl.DateTimeFormat.Types
2+ ( StringRep(..)
3+ , NumericRep(..)
4+ , MonthRep(..)
5+ , TimeZoneNameRep(..)
6+ , FormatParts(..)
7+ , readFormatParts
8+ , ResolvedOptions(..)
9+ , WeekdayYearMonthDayHourMinuteSecond(..)
10+ , WeekdayYearMonthDay(..)
11+ , YearMonthDay(..)
12+ , YearMonth(..)
13+ , MonthDay(..)
14+ , HourMinuteSecond(..)
15+ , HourMinute(..)
16+ , Undefined
17+ , undefined
18+ ) where
219
3−import Prelude (class Show)
20+import Data.Foreign (F, Foreign, ForeignError(..), fail, readString)
21+import Data.Foreign.Index ((!))
22+import Data.Intl.DateTimeFormat.Class (class FormatComponent, FormatComponentRecord(..), defaultComponentRecord)
23+import Data.Maybe (Maybe(..))
24+import Data.Newtype (class Newtype, over)
25+import Prelude (class Eq, class Show, bind, pure, show, ($), (<>), (>>=))
26+
27+foreign import data Undefined :: Type
28+
29+foreign import undefined :: Undefined
430
531data StringRep = Narrow | Short | Long
632
33+derive instance eqStringRep :: Eq StringRep
34+
735instance showStringRep :: Show StringRep where
836 show Narrow = "narrow"
937 show Short = "short"
@@ -11,12 +39,16 @@ instance showStringRep :: Show StringRep where
1139
1240data NumericRep = Numeric | TwoDigit
1341
42+derive instance eqNumericRep :: Eq NumericRep
43+
1444instance showNumericRep :: Show NumericRep where
1545 show Numeric = "numeric"
1646 show TwoDigit = "2-digit"
1747
1848data MonthRep = MonthNumeric | MonthTwoDigit | MonthNarrow | MonthShort | MonthLong
1949
50+derive instance eqMonthRep :: Eq MonthRep
51+
2052instance showMonthRep :: Show MonthRep where
2153 show MonthNumeric = "numeric"
2254 show MonthTwoDigit = "2-digit"
@@ -26,7 +58,189 @@ instance showMonthRep :: Show MonthRep where
2658
2759data TimeZoneNameRep = TimeZoneNameShort | TimeZoneNameLong
2860
61+derive instance eqTimeZoneNameRep :: Eq TimeZoneNameRep
62+
2963instance showTimeZoneRep :: Show TimeZoneNameRep where
3064 show TimeZoneNameShort = "short"
3165 show TimeZoneNameLong = "long"
3266
67+data FormatParts
68+ = Era String
69+ | Year String
70+ | Month String
71+ | Weekday String
72+ | Day String
73+ | Hour String
74+ | Minute String
75+ | DayPeriod String
76+ | Literal String
77+
78+derive instance eqFormatParts :: Eq FormatParts
79+
80+readFormatParts :: Foreign -> F FormatParts
81+readFormatParts val = do
82+ type_ <- val ! "type" >>= readString
83+ value <- val ! "value" >>= readString
84+ case type_ of
85+ "era" -> pure $ Era value
86+ "year" -> pure $ Year value
87+ "month" -> pure $ Month value
88+ "weekday" -> pure $ Weekday value
89+ "month" -> pure $ Month value
90+ "day" -> pure $ Day value
91+ "hour" -> pure $ Hour value
92+ "minute" -> pure $ Minute value
93+ "dayperiod" -> pure $ DayPeriod value
94+ "literal" -> pure $ Literal value
95+ _ -> fail $ ForeignError ("type " <> type_ <> " is not supported by purescript-intl")
96+
97+newtype ResolvedOptions = ResolvedOptions
98+ { locale :: String
99+ , numberingSystem :: String
100+ , calendar :: String
101+ , timeZone :: String
102+ , era :: Maybe String
103+ , weekday :: Maybe String
104+ , year :: Maybe String
105+ , day :: Maybe String
106+ , hour :: Maybe String
107+ , minute :: Maybe String
108+ , second :: Maybe String
109+ , timeZoneName :: Maybe String
110+ }
111+
112+derive instance newtypeResolvedOptions :: Newtype ResolvedOptions _
113+
114+derive instance eqResolvedOptions :: Eq ResolvedOptions
115+
116+newtype WeekdayYearMonthDayHourMinuteSecond = WeekdayYearMonthDayHourMinuteSecond
117+ { weekday :: StringRep
118+ , year :: NumericRep
119+ , month :: MonthRep
120+ , day :: NumericRep
121+ , hour :: NumericRep
122+ , minute :: NumericRep
123+ , second :: NumericRep
124+ }
125+
126+derive instance newtypeWeekdayYearMonthDayHourMinuteSecond :: Newtype WeekdayYearMonthDayHourMinuteSecond _
127+
128+derive instance eqWeekdayYearMonthDayHourMinuteSecond :: Eq WeekdayYearMonthDayHourMinuteSecond
129+
130+instance formatComponentWeekdayYearMonthDayHourMinuteSecond :: FormatComponent WeekdayYearMonthDayHourMinuteSecond where
131+ formatComponent (WeekdayYearMonthDayHourMinuteSecond { weekday, year, month, day, hour, minute, second }) = over FormatComponentRecord
132+ (\r -> r { weekday = Just (show weekday)
133+ , year = Just (show year)
134+ , month = Just (show month)
135+ , day = Just (show day)
136+ , hour = Just (show hour)
137+ , minute = Just (show minute)
138+ , second = Just (show second)
139+ }
140+ ) defaultComponentRecord
141+
142+newtype WeekdayYearMonthDay = WeekdayYearMonthDay
143+ { weekday :: StringRep
144+ , year :: NumericRep
145+ , month :: MonthRep
146+ , day :: NumericRep
147+ }
148+
149+derive instance newtypeWeekdayYearMonthDay :: Newtype WeekdayYearMonthDay _
150+
151+derive instance eqWeekdayYearMonthDay :: Eq WeekdayYearMonthDay
152+
153+instance formatComponentWeekdayYearMonthDay :: FormatComponent WeekdayYearMonthDay where
154+ formatComponent (WeekdayYearMonthDay { weekday, year, month, day }) = over FormatComponentRecord
155+ (\r -> r { weekday = Just (show weekday)
156+ , year = Just (show year)
157+ , month = Just (show month)
158+ , day = Just (show day)
159+ }
160+ ) defaultComponentRecord
161+
162+
163+newtype YearMonthDay = YearMonthDay
164+ { year :: NumericRep
165+ , month :: MonthRep
166+ , day :: NumericRep
167+ }
168+
169+derive instance newtypeYearMonthDay :: Newtype YearMonthDay _
170+
171+derive instance eqYearMonthDay :: Eq YearMonthDay
172+
173+instance formatComponentYearMonthDay :: FormatComponent YearMonthDay where
174+ formatComponent (YearMonthDay { year, month, day }) = over FormatComponentRecord
175+ (\r -> r { year = Just (show year)
176+ , month = Just (show month)
177+ , day = Just (show day)
178+ }
179+ ) defaultComponentRecord
180+
181+
182+newtype YearMonth = YearMonth
183+ { year :: NumericRep
184+ , month :: MonthRep
185+ }
186+
187+derive instance newtypeYearMonth :: Newtype YearMonth _
188+
189+derive instance eqYearMonth :: Eq YearMonth
190+
191+instance formatComponentYearMonth :: FormatComponent YearMonth where
192+ formatComponent (YearMonth { year, month }) = over FormatComponentRecord
193+ (\r -> r { year = Just (show year)
194+ , month = Just (show month)
195+ }
196+ ) defaultComponentRecord
197+
198+newtype MonthDay = MonthDay
199+ { month :: MonthRep
200+ , day :: NumericRep
201+ }
202+
203+derive instance newtypeMonthDay :: Newtype MonthDay _
204+
205+derive instance eqMonthDay :: Eq MonthDay
206+
207+instance formatComponentMonthDay :: FormatComponent MonthDay where
208+ formatComponent (MonthDay { month, day }) = over FormatComponentRecord
209+ (\r -> r { month = Just (show month)
210+ , day = Just (show day)
211+ }
212+ ) defaultComponentRecord
213+
214+newtype HourMinuteSecond = HourMinuteSecond
215+ { hour :: NumericRep
216+ , minute :: NumericRep
217+ , second :: NumericRep
218+ }
219+
220+derive instance newtypeHourMinuteSecond :: Newtype HourMinuteSecond _
221+
222+derive instance eqHourMinuteSecond :: Eq HourMinuteSecond
223+
224+instance formatComponentHourMinuteSecond :: FormatComponent HourMinuteSecond where
225+ formatComponent (HourMinuteSecond { hour, minute, second }) = over FormatComponentRecord
226+ (\r -> r { hour = Just (show hour)
227+ , minute = Just (show minute)
228+ , second = Just (show second)
229+ }
230+ ) defaultComponentRecord
231+
232+newtype HourMinute = HourMinute
233+ { hour :: NumericRep
234+ , minute :: NumericRep
235+ }
236+
237+derive instance newtypeHourMinute :: Newtype HourMinute _
238+
239+derive instance eqHourMinute :: Eq HourMinute
240+
241+instance formatComponentHourMinute :: FormatComponent HourMinute where
242+ formatComponent (HourMinute { hour, minute }) = over FormatComponentRecord
243+ (\r -> r { hour = Just (show hour)
244+ , minute = Just (show minute)
245+ }
246+ ) defaultComponentRecord
test/Test/Main.purs+64−24
@@ -4,18 +4,22 @@ import Prelude
44
55import Control.Monad.Eff (Eff)
66import Control.Monad.Eff.Console (CONSOLE)
7+import Control.Monad.Except (runExcept)
78import Data.DateTime (Date, DateTime(..), Month(..), canonicalDate)
8−import Data.Either (Either(..), isLeft)
9+import Data.Either (Either(..), fromRight, isLeft)
910import Data.Enum (toEnum)
11+import Data.Foldable (intercalate)
12+import Data.Foreign (F, renderForeignError)
1013import Data.Generic.Rep (class Generic)
11−import Data.Intl.DateTimeFormat (DateTimeFormatOptions(..), DateTimeFormatOptions', HourMinute(HourMinute), HourMinuteSecond(HourMinuteSecond), LocalesOption, MonthDay(..), MonthRep(..), NumericRep(Numeric, TwoDigit), StringRep(..), TimeZone(TimeZone), WeekdayYearMonthDay(..), WeekdayYearMonthDayHourMinuteSecond(WeekdayYearMonthDayHourMinuteSecond), YearMonth(..), YearMonthDay(..), createDateTimeFormatter, formatJSDate, supportedLocalesOf)
12−import Data.Intl.DateTimeFormat.Generic (class FormatComponent, genericFormatComponent)
14+import Data.Intl.DateTimeFormat (DateTimeFormatOptions(DateTimeFormatOptions), DateTimeFormatOptions', HourMinute(HourMinute), HourMinuteSecond(HourMinuteSecond), LocalesOption, MonthDay(MonthDay), MonthRep(MonthTwoDigit, MonthNumeric, MonthNarrow, MonthShort, MonthLong), NumericRep(Numeric, TwoDigit), ResolvedOptions(..), StringRep(Short, Long), TimeZone(TimeZone), WeekdayYearMonthDay(WeekdayYearMonthDay), WeekdayYearMonthDayHourMinuteSecond(WeekdayYearMonthDayHourMinuteSecond), YearMonth(YearMonth), YearMonthDay(YearMonthDay), createDateTimeFormat, formatJSDate, resolvedOptions, supportedLocalesOf)
15+import Data.Intl.DateTimeFormat.Class (class FormatComponent, FormatComponentRecord(..))
16+import Data.Intl.DateTimeFormat.Generic (genericFormatComponent)
1317import Data.JSDate (JSDate, fromDateTime)
14−import Data.Maybe (Maybe(..))
18+import Data.Maybe (Maybe(..), isJust, isNothing)
1519import Data.Symbol (SProxy(..))
1620import Data.Time (Time(..))
1721import Data.Variant (inj)
18−import Partial.Unsafe (unsafeCrashWith)
22+import Partial.Unsafe (unsafeCrashWith, unsafePartial)
1923import Test.Assert (ASSERT, assert')
2024
2125type Tests = Eff (console :: CONSOLE, assert :: ASSERT) Unit
@@ -33,7 +37,7 @@ instance formatComponentEraYear :: FormatComponent EraYear where
3337newtype Era = Era StringRep
3438
3539instance formatComponentEra :: FormatComponent Era where
36− formatComponent (Era r) =
40+ formatComponent (Era r) = FormatComponentRecord
3741 { era: Just (show r)
3842 , weekday: Nothing
3943 , year: Nothing
@@ -49,11 +53,28 @@ main :: Tests
4953main = do
5054 let
5155
56+ unsafeFromF :: forall a. F a -> a
57+ unsafeFromF = unsafePartial fromRight <<< runExcept
58+
5259 locales :: LocalesOption
5360 locales = inj (SProxy :: SProxy "locale") "en-US"
5461
55− fmtHourMinute =
56− createDateTimeFormatter locales opts
62+ fmtError =
63+ createDateTimeFormat (inj (SProxy :: SProxy "locale") "") opts
64+ where
65+ opts :: DateTimeFormatOptions'
66+ opts =
67+ (DateTimeFormatOptions
68+ { localeMatcher: Nothing
69+ , timeZone: (Just (TimeZone "Europe/London"))
70+ , hour12: Just false
71+ , formatMatcher: Nothing
72+ }
73+ (inj (SProxy :: SProxy "hourMinute") (HourMinute {hour: TwoDigit, minute: TwoDigit}))
74+ )
75+
76+ fmtHourMinute = unsafeFromF $
77+ createDateTimeFormat locales opts
5778 where
5879 opts :: DateTimeFormatOptions'
5980 opts =
@@ -66,8 +87,8 @@ main = do
6687 (inj (SProxy :: SProxy "hourMinute") (HourMinute {hour: TwoDigit, minute: TwoDigit}))
6788 )
6889
69− fmtHourMinuteSecond =
70− createDateTimeFormatter locales opts
90+ fmtHourMinuteSecond = unsafeFromF $
91+ createDateTimeFormat locales opts
7192 where
7293 opts :: DateTimeFormatOptions'
7394 opts =
@@ -80,8 +101,8 @@ main = do
80101 (inj (SProxy :: SProxy "hourMinuteSecond") (HourMinuteSecond {hour: Numeric, minute: Numeric, second: Numeric}))
81102 )
82103
83− fmtWeekdayYearMonthDayHourMinuteSecond =
84− createDateTimeFormatter locales opts
104+ fmtWeekdayYearMonthDayHourMinuteSecond = unsafeFromF $
105+ createDateTimeFormat locales opts
85106 where
86107 opts :: DateTimeFormatOptions'
87108 opts =
@@ -106,8 +127,8 @@ main = do
106127 )
107128 )
108129
109− fmtWeekdayYearMonthDay =
110− createDateTimeFormatter locales opts
130+ fmtWeekdayYearMonthDay = unsafeFromF $
131+ createDateTimeFormat locales opts
111132 where
112133 opts :: DateTimeFormatOptions'
113134 opts =
@@ -129,8 +150,8 @@ main = do
129150 )
130151 )
131152
132− fmtYearMonthDay =
133− createDateTimeFormatter locales opts
153+ fmtYearMonthDay = unsafeFromF $
154+ createDateTimeFormat locales opts
134155 where
135156 opts :: DateTimeFormatOptions'
136157 opts =
@@ -151,8 +172,8 @@ main = do
151172 )
152173 )
153174
154− fmtYearMonth =
155− createDateTimeFormatter locales opts
175+ fmtYearMonth = unsafeFromF $
176+ createDateTimeFormat locales opts
156177 where
157178 opts :: DateTimeFormatOptions'
158179 opts =
@@ -172,8 +193,8 @@ main = do
172193 )
173194 )
174195
175− fmtMonthDay =
176− createDateTimeFormatter locales opts
196+ fmtMonthDay = unsafeFromF $
197+ createDateTimeFormat locales opts
177198 where
178199 opts :: DateTimeFormatOptions'
179200 opts =
@@ -193,8 +214,8 @@ main = do
193214 )
194215 )
195216
196− fmtEraYear =
197− createDateTimeFormatter locales opts
217+ fmtEraYear = unsafeFromF $
218+ createDateTimeFormat locales opts
198219 where
199220 opts :: DateTimeFormatOptions EraYear
200221 opts =
@@ -214,8 +235,8 @@ main = do
214235 )
215236 )
216237
217− fmtEra =
218− createDateTimeFormatter locales opts
238+ fmtEra = unsafeFromF $
239+ createDateTimeFormat locales opts
219240 where
220241 opts :: DateTimeFormatOptions Era
221242 opts =
@@ -259,6 +280,9 @@ main = do
259280 case jsDate of
260281 Nothing -> unsafeCrashWith "jsDate not parsed"
261282 Just d -> do
283+
284+ assert' "fmtError expected to return error" $ isLeft (runExcept fmtError)
285+
262286 let fmtDate1 = formatJSDate fmtWeekdayYearMonthDayHourMinuteSecond d
263287 fmtDate1Expected = "Tue, January 2, 2018, 12:00:00 PM"
264288 assert' ("fmtWeekdayYearMonthDayHourMinuteSecond: got: '" <> fmtDate1 <> "' expected: '" <> fmtDate1Expected <> "'")
@@ -301,3 +325,19 @@ main = do
301325
302326 let err = supportedLocalesOf ["en_US"]
303327 assert' ("supportedLocalesOf got: " <> show err) $ isLeft err
328+
329+ -- formatToParts is not supported in node
330+ -- let parts = runExcept $ formatToParts fmtHourMinute d
331+ -- assert' ("") $ isRight parts
332+
333+ case runExcept (resolvedOptions fmtHourMinuteSecond) of
334+ Left errs-> assert' ("resolvedOptions error: " <> (intercalate "; " $ renderForeignError <$> errs)) false
335+ Right (ResolvedOptions {locale, year, day, weekday, hour, minute, second}) -> do
336+ assert' ("resolvedOptions locale: got: " <> locale) $ (locale == "en-US") || (locale == "en")
337+ assert' ("resolvedOptions year: got Just") $ isNothing year
338+ assert' ("resolvedOptions day: got Just") $ isNothing day
339+ assert' ("resolvedOptions weekday: got Just") $ isNothing weekday
340+ assert' ("resolvedOptions hour: got Nothing") $ isJust hour
341+ assert' ("resolvedOptions minute: got Nothing") $ isJust minute
342+ assert' ("resolvedOptions second: got Nothing") $ isJust second
343+