fix: Expand setters like .year(2000) .hour(12)

iamkun · iamkun · commit ac532a0f0a00 · 2019-03-07T14:02:52.000+08:00
diff --git a/src/index.js b/src/index.js
@@ -109,36 +109,41 @@ class Dayjs {
     return this.endOf(units) < dayjs(that)
   }
 
-  year() {
-    return this.$y
+  $g(input, get, set) {
+    if (Utils.u(input)) return this[get]
+    return this.set(set, input)
   }
 
-  month() {
-    return this.$M
+  year(input) {
+    return this.$g(input, '$y', C.Y)
   }
 
-  day() {
-    return this.$W
+  month(input) {
+    return this.$g(input, '$M', C.M)
   }
 
-  date() {
-    return this.$D
+  day(input) {
+    return this.$g(input, '$W', C.D)
   }
 
-  hour() {
-    return this.$H
+  date(input) {
+    return this.$g(input, '$D', C.DATE)
   }
 
-  minute() {
-    return this.$m
+  hour(input) {
+    return this.$g(input, '$H', C.H)
   }
 
-  second() {
-    return this.$s
+  minute(input) {
+    return this.$g(input, '$m', C.MIN)
   }
 
-  millisecond() {
-    return this.$ms
+  second(input) {
+    return this.$g(input, '$s', C.S)
+  }
+
+  millisecond(input) {
+    return this.$g(input, '$ms', C.MS)
   }
 
   unix() {
diff --git a/test/get-set.test.js b/test/get-set.test.js
@@ -12,34 +12,50 @@ afterEach(() => {
 
 it('Year', () => {
   expect(dayjs().year()).toBe(moment().year())
+  expect(dayjs().year(0).valueOf()).toBe(moment().year(0).valueOf())
+  expect(dayjs().year(2000).valueOf()).toBe(moment().year(2000).valueOf())
 })
 
 it('Month', () => {
   expect(dayjs().month()).toBe(moment().month())
+  expect(dayjs().month(0).valueOf()).toBe(moment().month(0).valueOf())
+  expect(dayjs().month(1).valueOf()).toBe(moment().month(1).valueOf())
 })
 
 it('Day of Week', () => {
   expect(dayjs().day()).toBe(moment().day())
+  expect(dayjs().day(0).format()).toBe(moment().day(0).format())
+  expect(dayjs().day(1).format()).toBe(moment().day(1).format())
 })
 
 it('Date', () => {
   expect(dayjs().date()).toBe(moment().date())
+  expect(dayjs().date(0).valueOf()).toBe(moment().date(0).valueOf())
+  expect(dayjs().date(1).valueOf()).toBe(moment().date(1).valueOf())
 })
 
 it('Hour', () => {
   expect(dayjs().hour()).toBe(moment().hour())
+  expect(dayjs().hour(0).valueOf()).toBe(moment().hour(0).valueOf())
+  expect(dayjs().hour(1).valueOf()).toBe(moment().hour(1).valueOf())
 })
 
 it('Minute', () => {
   expect(dayjs().minute()).toBe(moment().minute())
+  expect(dayjs().minute(0).valueOf()).toBe(moment().minute(0).valueOf())
+  expect(dayjs().minute(1).valueOf()).toBe(moment().minute(1).valueOf())
 })
 
 it('Second', () => {
   expect(dayjs().second()).toBe(moment().second())
+  expect(dayjs().second(0).valueOf()).toBe(moment().second(0).valueOf())
+  expect(dayjs().second(1).valueOf()).toBe(moment().second(1).valueOf())
 })
 
 it('Millisecond', () => {
   expect(dayjs().millisecond()).toBe(moment().millisecond())
+  expect(dayjs().millisecond(0).valueOf()).toBe(moment().millisecond(0).valueOf())
+  expect(dayjs().millisecond(1).valueOf()).toBe(moment().millisecond(1).valueOf())
 })
 
 it('Set Day', () => {

Original file line number	Diff line number	Diff line change
`@@ -109,36 +109,41 @@ class Dayjs {`
`109`	`109`	`return this.endOf(units) < dayjs(that)`
`110`	`110`	`}`
`111`	`111`
`112`		`- year() {`
`113`		`- return this.$y`
	`112`	`+ $g(input, get, set) {`
	`113`	`+ if (Utils.u(input)) return this[get]`
	`114`	`+ return this.set(set, input)`
`114`	`115`	`}`
`115`	`116`
`116`		`- month() {`
`117`		`- return this.$M`
	`117`	`+ year(input) {`
	`118`	`+ return this.$g(input, '$y', C.Y)`
`118`	`119`	`}`
`119`	`120`
`120`		`- day() {`
`121`		`- return this.$W`
	`121`	`+ month(input) {`
	`122`	`+ return this.$g(input, '$M', C.M)`
`122`	`123`	`}`
`123`	`124`
`124`		`- date() {`
`125`		`- return this.$D`
	`125`	`+ day(input) {`
	`126`	`+ return this.$g(input, '$W', C.D)`
`126`	`127`	`}`
`127`	`128`
`128`		`- hour() {`
`129`		`- return this.$H`
	`129`	`+ date(input) {`
	`130`	`+ return this.$g(input, '$D', C.DATE)`
`130`	`131`	`}`
`131`	`132`
`132`		`- minute() {`
`133`		`- return this.$m`
	`133`	`+ hour(input) {`
	`134`	`+ return this.$g(input, '$H', C.H)`
`134`	`135`	`}`
`135`	`136`
`136`		`- second() {`
`137`		`- return this.$s`
	`137`	`+ minute(input) {`
	`138`	`+ return this.$g(input, '$m', C.MIN)`
`138`	`139`	`}`
`139`	`140`
`140`		`- millisecond() {`
`141`		`- return this.$ms`
	`141`	`+ second(input) {`
	`142`	`+ return this.$g(input, '$s', C.S)`
	`143`	`+ }`
	`144`	`+`
	`145`	`+ millisecond(input) {`
	`146`	`+ return this.$g(input, '$ms', C.MS)`
`142`	`147`	`}`
`143`	`148`
`144`	`149`	`unix() {`