Skip to content

Commit a744d9b

Browse files
author
samgarasx
committed
Update kotlin-moment wrapper to v2.29.1
1 parent 33e98eb commit a744d9b

File tree

4 files changed

+48
-69
lines changed

4 files changed

+48
-69
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ kotlin-react-dom.version=17.0.2-pre.258
77
kotlin-styled.version=5.3.1-pre.258
88

99
kotlin-antd.version=4.8.6-pre.15
10-
kotlin-moment.version=2.27.0-pre.13
10+
kotlin-moment.version=2.29.1-pre.14
1111
kotlin-react-intl.version=5.8.1-pre.13
1212
kotlin-react-responsive.version=8.1.0-pre.13
1313
kotlin-uikit.version=3.5.7-pre.12

kotlin-moment/src/main/kotlin/moment/Constructor.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ package moment
22

33
@JsModule("moment")
44
@JsNonModule
5-
external fun moment(
6-
inp: MomentInput? = definedExternally,
7-
strict: Boolean? = definedExternally): Moment
5+
external fun moment(inp: MomentInput? = definedExternally, strict: Boolean? = definedExternally): Moment
86

97
@JsModule("moment")
108
@JsNonModule
119
external fun moment(
1210
inp: MomentInput? = definedExternally,
1311
format: MomentFormatSpecification? = definedExternally,
14-
strict: Boolean? = definedExternally): Moment
12+
strict: Boolean? = definedExternally
13+
): Moment
1514

1615
@JsModule("moment")
1716
@JsNonModule
1817
external fun moment(
1918
inp: MomentInput? = definedExternally,
2019
format: MomentFormatSpecification? = definedExternally,
2120
language: String? = definedExternally,
22-
strict: Boolean? = definedExternally): Moment
21+
strict: Boolean? = definedExternally
22+
): Moment

kotlin-moment/src/main/kotlin/moment/Moment.kt

Lines changed: 40 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ external interface Locale {
1010
fun calendar(
1111
key: CalendarKey? = definedExternally,
1212
m: Moment? = definedExternally,
13-
now: Moment? = definedExternally): String
13+
now: Moment? = definedExternally
14+
): String
1415

1516
fun longDateFormat(key: LongDateFormatKey): String
1617
fun invalidDate(): String
@@ -22,7 +23,8 @@ external interface Locale {
2223
n: Number,
2324
withoutSuffix: Boolean,
2425
key: RelativeTimeKey,
25-
isFuture: Boolean): String
26+
isFuture: Boolean
27+
): String
2628

2729
fun pastFuture(diff: Number, absRelTime: String): String
2830
fun set(config: Any)
@@ -176,9 +178,7 @@ external interface ArgThresholdOpts {
176178
external interface Duration {
177179
fun clone(): Duration
178180

179-
fun humanize(
180-
withSuffix: Boolean? = definedExternally,
181-
argThresholds: ArgThresholdOpts? = definedExternally): String
181+
fun humanize(withSuffix: Boolean? = definedExternally, argThresholds: ArgThresholdOpts? = definedExternally): String
182182

183183
fun abs(): Duration
184184

@@ -209,13 +209,8 @@ external interface Duration {
209209
fun years(): Number
210210
fun asYears(): Number
211211

212-
fun add(
213-
inp: DurationInputArg1? = definedExternally,
214-
unit: DurationInputArg2? = definedExternally): Duration
215-
216-
fun subtract(
217-
inp: DurationInputArg1? = definedExternally,
218-
unit: DurationInputArg2? = definedExternally): Duration
212+
fun add(inp: DurationInputArg1? = definedExternally, unit: DurationInputArg2? = definedExternally): Duration
213+
fun subtract(inp: DurationInputArg1? = definedExternally, unit: DurationInputArg2? = definedExternally): Duration
219214

220215
fun locale(): String
221216
fun locale(locale: LocaleSpecifier): Duration
@@ -287,7 +282,7 @@ external interface MomentParsingFlags {
287282
var userInvalidated: Boolean
288283
var iso: Boolean
289284
var parsedDateParts: Array<Any>
290-
var meridiem: Any /* String | Unit */
285+
var meridiem: Any? /* String | Unit */
291286
}
292287

293288
external interface MomentParsingFlagsOpt {
@@ -406,18 +401,14 @@ external interface Moment {
406401
fun startOf(unitOfTime: StartOf): Moment
407402
fun endOf(unitOfTime: StartOf): Moment
408403

409-
fun add(
410-
amount: DurationInputArg1? = definedExternally,
411-
unit: DurationInputArg2? = definedExternally): Moment
404+
fun add(amount: DurationInputArg1? = definedExternally, unit: DurationInputArg2? = definedExternally): Moment
412405

413406
/**
414407
* @deprecated reverse syntax
415408
*/
416409
fun add(unit: DurationConstructor, amount: Any /* Number | String */): Moment
417410

418-
fun subtract(
419-
amount: DurationInputArg1? = definedExternally,
420-
unit: DurationInputArg2? = definedExternally): Moment
411+
fun subtract(amount: DurationInputArg1? = definedExternally, unit: DurationInputArg2? = definedExternally): Moment
421412

422413
/**
423414
* @deprecated reverse syntax
@@ -545,10 +536,7 @@ external interface Moment {
545536
fun fromNow(withoutSuffix: Boolean? = definedExternally): String
546537
fun toNow(withoutPrefix: Boolean? = definedExternally): String
547538

548-
fun diff(
549-
b: MomentInput,
550-
unitOfTime: Diff? = definedExternally,
551-
precise: Boolean? = definedExternally): Number
539+
fun diff(b: MomentInput, unitOfTime: Diff? = definedExternally, precise: Boolean? = definedExternally): Number
552540

553541
fun toArray(): Array<Number>
554542
fun toDate(): Date
@@ -565,42 +553,25 @@ external interface Moment {
565553
fun zone(): Number
566554
fun zone(b: Any /* Number | String */): Moment
567555
fun utcOffset(): Number
568-
fun utcOffset(
569-
b: Any /* Number | String */,
570-
keepLocalTime: Boolean? = definedExternally): Moment
571-
556+
fun utcOffset(b: Any /* Number | String */, keepLocalTime: Boolean? = definedExternally): Moment
572557
fun isUtcOffset(): Boolean
573558
fun daysInMonth(): Number
574559
fun isDST(): Boolean
575560

576561
fun zoneAbbr(): String
577562
fun zoneName(): String
578563

579-
fun isBefore(
580-
inp: MomentInput? = definedExternally,
581-
granularity: StartOf? = definedExternally): Boolean
582-
583-
fun isAfter(
584-
inp: MomentInput? = definedExternally,
585-
granularity: StartOf? = definedExternally): Boolean
586-
587-
fun isSame(
588-
inp: MomentInput? = definedExternally,
589-
granularity: StartOf? = definedExternally): Boolean
590-
591-
fun isSameOrAfter(
592-
inp: MomentInput? = definedExternally,
593-
granularity: StartOf? = definedExternally): Boolean
594-
595-
fun isSameOrBefore(
596-
inp: MomentInput? = definedExternally,
597-
granularity: StartOf? = definedExternally): Boolean
598-
564+
fun isBefore(inp: MomentInput? = definedExternally, granularity: StartOf? = definedExternally): Boolean
565+
fun isAfter(inp: MomentInput? = definedExternally, granularity: StartOf? = definedExternally): Boolean
566+
fun isSame(inp: MomentInput? = definedExternally, granularity: StartOf? = definedExternally): Boolean
567+
fun isSameOrAfter(inp: MomentInput? = definedExternally, granularity: StartOf? = definedExternally): Boolean
568+
fun isSameOrBefore(inp: MomentInput? = definedExternally, granularity: StartOf? = definedExternally): Boolean
599569
fun isBetween(
600570
a: MomentInput,
601571
b: MomentInput,
602572
granularity: StartOf? = definedExternally,
603-
inclusivity: String? = definedExternally /* "()" | "[)" | "(]" | "[]" */): Boolean
573+
inclusivity: String? = definedExternally /* "()" | "[)" | "(]" | "[]" */
574+
): Boolean
604575

605576
/**
606577
* @deprecated as of 2.8.0, use locale
@@ -629,7 +600,8 @@ external interface Moment {
629600
fun max(
630601
inp: MomentInput? = definedExternally,
631602
format: MomentFormatSpecification? = definedExternally,
632-
strict: Boolean? = definedExternally): Moment
603+
strict: Boolean? = definedExternally
604+
): Moment
633605

634606
/**
635607
* @deprecated as of 2.7.0, use moment.min/max
@@ -638,7 +610,8 @@ external interface Moment {
638610
inp: MomentInput? = definedExternally,
639611
format: MomentFormatSpecification? = definedExternally,
640612
language: String? = definedExternally,
641-
strict: Boolean? = definedExternally): Moment
613+
strict: Boolean? = definedExternally
614+
): Moment
642615

643616
// NOTE(constructor): Same as moment constructor
644617
/**
@@ -647,7 +620,8 @@ external interface Moment {
647620
fun min(
648621
inp: MomentInput? = definedExternally,
649622
format: MomentFormatSpecification? = definedExternally,
650-
strict: Boolean? = definedExternally): Moment
623+
strict: Boolean? = definedExternally
624+
): Moment
651625

652626
/**
653627
* @deprecated as of 2.7.0, use moment.min/max
@@ -656,7 +630,8 @@ external interface Moment {
656630
inp: MomentInput? = definedExternally,
657631
format: MomentFormatSpecification? = definedExternally,
658632
language: String? = definedExternally,
659-
strict: Boolean? = definedExternally): Moment
633+
strict: Boolean? = definedExternally
634+
): Moment
660635

661636
fun get(unit: All): Number
662637
fun set(unit: All, value: Number): Moment
@@ -672,13 +647,15 @@ external var fn: Moment
672647
external fun utc(
673648
inp: MomentInput? = definedExternally,
674649
format: MomentFormatSpecification? = definedExternally,
675-
strict: Boolean? = definedExternally): Moment
650+
strict: Boolean? = definedExternally
651+
): Moment
676652

677653
external fun utc(
678654
inp: MomentInput? = definedExternally,
679655
format: MomentFormatSpecification? = definedExternally,
680656
language: String? = definedExternally,
681-
strict: Boolean? = definedExternally): Moment
657+
strict: Boolean? = definedExternally
658+
): Moment
682659

683660
external fun unix(timestamp: Number): Moment
684661

@@ -695,33 +672,35 @@ external fun lang(language: String? = definedExternally): String
695672
/**
696673
* @deprecated in 2.8.0
697674
*/
698-
external fun lang(
699-
language: String? = definedExternally,
700-
definition: Locale? = definedExternally): String
675+
external fun lang(language: String? = definedExternally, definition: Locale? = definedExternally): String
701676

702677
external fun locale(language: String? = definedExternally): String
703678
external fun locale(language: Array<String>? = definedExternally): String
704679
external fun locale(
705680
language: String? = definedExternally,
706-
definition: Any? = definedExternally /* LocaleSpecification | Unit */): String
681+
definition: Any? = definedExternally /* LocaleSpecification | Unit */
682+
): String
707683

708684
external fun localeData(key: Any? = definedExternally /* String | Array<String> */): Locale
709685

710686
external fun duration(
711687
inp: DurationInputArg1? = definedExternally,
712-
unit: DurationInputArg2? = definedExternally): Duration
688+
unit: DurationInputArg2? = definedExternally
689+
): Duration
713690

714691
// NOTE(constructor): Same as moment constructor
715692
external fun parseZone(
716693
inp: MomentInput? = definedExternally,
717694
format: MomentFormatSpecification? = definedExternally,
718-
strict: Boolean? = definedExternally): Moment
695+
strict: Boolean? = definedExternally
696+
): Moment
719697

720698
external fun parseZone(
721699
inp: MomentInput? = definedExternally,
722700
format: MomentFormatSpecification? = definedExternally,
723701
language: String? = definedExternally,
724-
strict: Boolean? = definedExternally): Moment
702+
strict: Boolean? = definedExternally
703+
): Moment
725704

726705
external fun months(): Array<String>
727706
external fun months(index: Number): String

kotlin-moment/src/main/kotlin/moment/Types.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ typealias Base = Any /* "year" | "years" | "y" | "month" | "months" | "M" | "wee
1919
typealias _quarter = String /* "quarter" | "quarters" | "Q" */
2020
typealias _isoWeek = String /* "isoWeek" | "isoWeeks" | "W" */
2121
typealias _date = String /* "date" | "dates" | "D" */
22-
typealias DurationConstructor = Any /* Base | _quarter | _isoWeek | Unit */
22+
typealias DurationConstructor = Any /* Base | _quarter | _isoWeek */
2323

2424
typealias DurationAs = Base
2525

26-
typealias StartOf = Any /* Base | _quarter | _isoWeek | _date */
26+
typealias StartOf = Any /* Base | _quarter | _isoWeek | _date | Unit */
2727

2828
typealias Diff = Any /* Base | _quarter */
2929

0 commit comments

Comments
 (0)