git.iko.soy/purescript-intl
on master help sign in
createDateTimeFormat - rename
commit3a7bbdc2876d55ac04ec07d0619a613243eca582 authorMarcin Szamotulski <mszamot@gmail.com> dateSun 18 Jun 2017, 22:43 (9 years ago) parentb9e6360
3 files changed+26−27
compare with master
unifiedsplit
src/Data/Intl/DateTimeFormat.js+1−1 src/Data/Intl/DateTimeFormat.purs+14−15 test/Test/Main.purs+11−11
src/Data/Intl/DateTimeFormat.js+1−1
@@ -8,7 +8,7 @@ exports.dateTimeFormatImpl = function(locales) {
88 };
99};
1010
11−exports.createDateTimeFormatterImpl = function(throwError, pure, locales, opts) {
11+exports.createDateTimeFormatImpl = function(throwError, pure, locales, opts) {
1212 try {
1313 return pure(Intl.DateTimeFormat(locales, opts));
1414 } catch (e) {
src/Data/Intl/DateTimeFormat.purs+14−15
@@ -15,8 +15,8 @@ module Data.Intl.DateTimeFormat
1515 , DateTimeFormatOptions(..)
1616 , DateTimeFormatOptions'
1717 , DateTimeComponents(..)
18− , DateTimeFormatter
19− , createDateTimeFormatter
18+ , DateTimeFormat
19+ , createDateTimeFormat
2020 , formatJSDate
2121 , module Data.Intl.DateTimeFormat.Types
2222 , supportedLocalesOf
@@ -44,7 +44,6 @@ import Prelude (class Eq, class Show, Unit, bind, id, pure, show, (#), ($), (<$>
4444import Unsafe.Coerce (unsafeCoerce)
4545
4646foreign import data LocalesOption' :: Type
47−foreign import data DateTimeFormat :: Type
4847
4948foreign import data Undefined :: Type
5049foreign import undefined :: Undefined
@@ -279,30 +278,30 @@ formatDateTimeOptions (DateTimeFormatOptions opts comps) = merge opts' (compsCoe
279278 -> DateTimeFormatOptions_
280279 merge a b = unsafeCoerce $ union (unsafeCoerce a) (unsafeCoerce b)
281280
282−foreign import data DateTimeFormatter :: Type
281+foreign import data DateTimeFormat :: Type
283282
284−foreign import createDateTimeFormatterImpl
283+foreign import createDateTimeFormatImpl
285284 :: Fn4
286285 (forall a. String -> F a)
287286 (forall a. a -> F a)
288287 LocalesOption'
289288 DateTimeFormatOptions_
290− (F DateTimeFormatter)
289+ (F DateTimeFormat)
291290
292−createDateTimeFormatter
291+createDateTimeFormat
293292 :: forall a
294293 .(FormatComponent a)
295294 => LocalesOption
296295 -> DateTimeFormatOptions a
297− -> F DateTimeFormatter
298−createDateTimeFormatter ls opts =
299− runFn4 createDateTimeFormatterImpl
296+ -> F DateTimeFormat
297+createDateTimeFormat ls opts =
298+ runFn4 createDateTimeFormatImpl
300299 (throwError <<< pure <<< ForeignError)
301300 pure
302301 (toLocale ls)
303302 (formatDateTimeOptions opts)
304303
305−foreign import formatJSDate :: DateTimeFormatter -> JSDate -> String
304+foreign import formatJSDate :: DateTimeFormat -> JSDate -> String
306305
307306foreign import supportedLocalesOfImpl
308307 :: Fn3
@@ -311,17 +310,17 @@ foreign import supportedLocalesOfImpl
311310 (Array String)
312311 (Either String (Array String))
313312
314−foreign import formatToPartsImpl :: DateTimeFormatter -> JSDate -> Array Foreign
313+foreign import formatToPartsImpl :: DateTimeFormat -> JSDate -> Array Foreign
315314
316−formatToParts :: DateTimeFormatter -> JSDate -> F (Array FormatParts)
315+formatToParts :: DateTimeFormat -> JSDate -> F (Array FormatParts)
317316formatToParts formatter date = sequence $ readFormatParts <$> formatToPartsImpl formatter date
318317
319318supportedLocalesOf :: Array String -> Either String (Array String)
320319supportedLocalesOf locales = runFn3 supportedLocalesOfImpl Left Right locales
321320
322−foreign import resolvedOptionsImpl :: DateTimeFormatter -> Foreign
321+foreign import resolvedOptionsImpl :: DateTimeFormat -> Foreign
323322
324−resolvedOptions :: DateTimeFormatter -> F ResolvedOptions
323+resolvedOptions :: DateTimeFormat -> F ResolvedOptions
325324resolvedOptions fmt = do
326325 locale <- obj ! "locale" >>= readString
327326 calendar <- obj ! "calendar" >>= readString
test/Test/Main.purs+11−11
@@ -11,7 +11,7 @@ import Data.Enum (toEnum)
1111import Data.Foldable (intercalate)
1212import Data.Foreign (F, renderForeignError)
1313import Data.Generic.Rep (class Generic)
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), createDateTimeFormatter, formatJSDate, resolvedOptions, supportedLocalesOf)
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)
1515import Data.Intl.DateTimeFormat.Generic (class FormatComponent, genericFormatComponent)
1616import Data.JSDate (JSDate, fromDateTime)
1717import Data.Maybe (Maybe(..), isJust, isNothing)
@@ -59,7 +59,7 @@ main = do
5959 locales = inj (SProxy :: SProxy "locale") "en-US"
6060
6161 fmtError =
62− createDateTimeFormatter (inj (SProxy :: SProxy "locale") "") opts
62+ createDateTimeFormat (inj (SProxy :: SProxy "locale") "") opts
6363 where
6464 opts :: DateTimeFormatOptions'
6565 opts =
@@ -73,7 +73,7 @@ main = do
7373 )
7474
7575 fmtHourMinute = unsafeFromF $
76− createDateTimeFormatter locales opts
76+ createDateTimeFormat locales opts
7777 where
7878 opts :: DateTimeFormatOptions'
7979 opts =
@@ -87,7 +87,7 @@ main = do
8787 )
8888
8989 fmtHourMinuteSecond = unsafeFromF $
90− createDateTimeFormatter locales opts
90+ createDateTimeFormat locales opts
9191 where
9292 opts :: DateTimeFormatOptions'
9393 opts =
@@ -101,7 +101,7 @@ main = do
101101 )
102102
103103 fmtWeekdayYearMonthDayHourMinuteSecond = unsafeFromF $
104− createDateTimeFormatter locales opts
104+ createDateTimeFormat locales opts
105105 where
106106 opts :: DateTimeFormatOptions'
107107 opts =
@@ -127,7 +127,7 @@ main = do
127127 )
128128
129129 fmtWeekdayYearMonthDay = unsafeFromF $
130− createDateTimeFormatter locales opts
130+ createDateTimeFormat locales opts
131131 where
132132 opts :: DateTimeFormatOptions'
133133 opts =
@@ -150,7 +150,7 @@ main = do
150150 )
151151
152152 fmtYearMonthDay = unsafeFromF $
153− createDateTimeFormatter locales opts
153+ createDateTimeFormat locales opts
154154 where
155155 opts :: DateTimeFormatOptions'
156156 opts =
@@ -172,7 +172,7 @@ main = do
172172 )
173173
174174 fmtYearMonth = unsafeFromF $
175− createDateTimeFormatter locales opts
175+ createDateTimeFormat locales opts
176176 where
177177 opts :: DateTimeFormatOptions'
178178 opts =
@@ -193,7 +193,7 @@ main = do
193193 )
194194
195195 fmtMonthDay = unsafeFromF $
196− createDateTimeFormatter locales opts
196+ createDateTimeFormat locales opts
197197 where
198198 opts :: DateTimeFormatOptions'
199199 opts =
@@ -214,7 +214,7 @@ main = do
214214 )
215215
216216 fmtEraYear = unsafeFromF $
217− createDateTimeFormatter locales opts
217+ createDateTimeFormat locales opts
218218 where
219219 opts :: DateTimeFormatOptions EraYear
220220 opts =
@@ -235,7 +235,7 @@ main = do
235235 )
236236
237237 fmtEra = unsafeFromF $
238− createDateTimeFormatter locales opts
238+ createDateTimeFormat locales opts
239239 where
240240 opts :: DateTimeFormatOptions Era
241241 opts =