Merge pull request #125 from xx45/feature/iamkun

fix: fix add millisecond
iamkun · May 10, 2018 · e00b943 · e00b943
2 parents a544174 + 12c35df
commit e00b943
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dayjs",
   "version": "0.0.0-development",
-  "description": "",
+  "description": "2KB immutable date library alternative to Moment.js with the same modern API ",
   "main": "dist/dayjs.min.js",
   "types": "index.d.ts",
   "scripts": {
@@ -23,6 +23,13 @@
       "src/*"
     ]
   },
+  "keywords": [
+    "dayjs",
+    "date",
+    "time",
+    "immutable",
+    "moment"
+  ],
   "author": "iamkun",
   "license": "MIT",
   "repository": {

diff --git a/src/index.js b/src/index.js
@@ -175,7 +175,8 @@ class Dayjs {
 
   add(number, units) {
     number = Number(number) // eslint-disable-line no-param-reassign
-    const unit = (units && units.length === 1) ? units : Utils.prettyUnit(units)
+    // units === 'ms' hard code here, will update in next release
+    const unit = (units && (units.length === 1 || units === 'ms')) ? units : Utils.prettyUnit(units)
     if (['M', C.M].indexOf(unit) > -1) {
       let date = this.set(C.DATE, 1).set(C.M, this.$M + number)
       date = date.set(C.DATE, Math.min(this.$D, date.daysInMonth()))
@@ -202,8 +203,12 @@ class Dayjs {
       case C.W:
         step = C.MILLISECONDS_A_WEEK
         break
-      default: // s seconds
+      case 's':
+      case C.S:
         step = C.MILLISECONDS_A_SECOND
+        break
+      default: // ms
+        step = 1
     }
     const nextTimeStamp = this.valueOf() + (number * step)
     return new Dayjs(nextTimeStamp)

diff --git a/test/manipulate.test.js b/test/manipulate.test.js
@@ -28,6 +28,8 @@ describe('StartOf EndOf', () => {
 
 
 it('Add Time days', () => {
+  expect(dayjs().add(1, 'ms').valueOf()).toBe(moment().add(1, 'ms').valueOf())
+  expect(dayjs().add(1, 'milliseconds').valueOf()).toBe(moment().add(1, 'milliseconds').valueOf())
   expect(dayjs().add(1, 's').valueOf()).toBe(moment().add(1, 's').valueOf())
   expect(dayjs().add(1, 'seconds').valueOf()).toBe(moment().add(1, 'seconds').valueOf())
   expect(dayjs().add(1, 'm').valueOf()).toBe(moment().add(1, 'm').valueOf())