Merge branch 'develop'

Author: Jonas Schubert

.gitignore

@@ -19,4 +19,5 @@ coverage
 #dev
 demo.js
 
+#folder
 .vs

.npmignore

@@ -25,4 +25,7 @@ docs
 
 #other
 .travis.yml
-karma.sauce.conf.js
+karma.sauce.conf.js
+
+#folder
+.vs

README.md

@@ -3,9 +3,9 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 <a target="_blank" href="https://www.paypal.me/GuepardoApps" title="Donate using PayPal"><img src="https://img.shields.io/badge/paypal-donate-blue.svg" /></a>
 
-[![Build](https://img.shields.io/badge/build-success-green.svg)](https://github.com/TimeXt/TimeXt-JavaScript/blob/master/releases/timext-2018-10-27-2.min.js)
-[![Version](https://img.shields.io/badge/version-v0.2.2.181027-blue.svg)](https://github.com/TimeXt/TimeXt-JavaScript/tree/master/releases/)
-[![CodeCoverage](https://img.shields.io/badge/codeCoverage-98-green.svg)](https://github.com/TimeXt/TimeXt-JavaScript/tree/master/test/)
+[![Build](https://img.shields.io/badge/build-success-green.svg)](https://github.com/TimeXt/TimeXt-JavaScript/blob/master/releases/timext-2018-10-28-1.min.js)
+[![Version](https://img.shields.io/badge/version-v0.3.0.181028-blue.svg)](https://github.com/TimeXt/TimeXt-JavaScript/tree/master/releases/)
+[![CodeCoverage](https://img.shields.io/badge/codeCoverage-98-green.svg)](https://github.com/TimeXt/TimeXt-JavaScript/tree/master/coverage/)
 
 [![Npm](https://img.shields.io/badge/npm-getit-red.svg)](https://www.npmjs.com/package/timext-js)
 
@@ -26,6 +26,7 @@ import timext from '../src/index';
 import * as u from '../src/units';
 
 // Create by using constructor method
+const twoYears = timext(2, u.Y);
 const oneWeek = timext(1, u.W);
 const threeDays = timext(3, u.D);
 const elevenHours = timext(11, u.H);
@@ -51,13 +52,18 @@ If you want to use the minified script from the releases
 import 'timext.min';
 
 // Create by using number extensions
+const twoYears = Number(2).toYears();                      // returns timext(2, u.Y)
 const oneWeek = Number(1).toWeeks();                       // returns timext(1, u.W)
 const threeDays = Number(3).toDays();                      // returns timext(3, u.D)
 const elevenHours = Number(11).toHours();                  // returns timext(11, u.H)
 const sixMinutes = Number(6).toMinutes();                  // returns timext(6, u.M)
 const fiftySeconds = Number(50).toSeconds();               // returns timext(50, u.S)
 const hundredMilliseconds = Number(100).toMilliseconds();  // returns timext(100, u.MS)
 
+// Convert to other time units
+const oneDayInMillis = Number(1).toDays().inMilliseconds();// Converts one day into milliseconds === 24 * 60 * 60 * 1e3
+const twoWeeksInHours = Number(2).toWeeks().inHours();     // Converts two weeks into hours === 2 * 7 * 24
+
 // add timext to date using date extensions
 const inFiveDays = Date.now.plus(Number(5).toDays());
 const threeWeeksAgo = Date.now.minus(Number(3).toWeeks());

package.json

@@ -1,15 +1,16 @@
 {
   "name": "timext-js",
-  "version": "0.2.2",
-  "description": "",
+  "version": "0.3.0",
+  "description": "2kB time library to handle date and time more easily",
   "main": "timext.min.js",
   "types": "",
   "scripts": {
     "test": "jest",
     "lint": "./node_modules/.bin/eslint src/* test/* build/*",
     "build": "cross-env BABEL_ENV=build node build",
     "sauce": "npx karma start karma.sauce.conf.js",
-    "test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2  && npm run sauce -- 3"
+    "test:sauce": "npm run sauce -- 0 && npm run sauce -- 1 && npm run sauce -- 2  && npm run sauce -- 3",
+    "size": "size-limit && gzip-size timext.min.js"
   },
   "repository": {
     "type": "git",
@@ -25,6 +26,12 @@
   "pre-commit": [
     "lint"
   ],
+  "size-limit": [
+    {
+      "limit": "2.00 KB",
+      "path": "timext.min.js"
+    }
+  ],
   "jest": {
     "roots": [
       "test"
@@ -57,7 +64,7 @@
     "eslint": "^4.19.1",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-import": "^2.10.0",
-    "eslint-plugin-jest": "^21.15.0",
+    "eslint-plugin-jest": "^21.26.2",
     "gzip-size-cli": "^2.1.0",
     "jasmine-core": "^2.99.1",
     "jest": "^22.4.3",
@@ -67,7 +74,9 @@
     "pre-commit": "^1.2.2",
     "rollup": "^0.57.1",
     "rollup-plugin-babel": "^4.0.0-beta.4",
-    "rollup-plugin-uglify": "^3.0.0"
+    "rollup-plugin-uglify": "^3.0.0",
+    "size-limit": "^0.18.0",
+    "typescript": "^2.8.3"
   },
   "dependencies": {}
 }

releases/timext-2018-10-28-1.min.js

@@ -7,6 +7,10 @@ class TimeXt {
         this.unit = unit;
     }
 
+    inYears() {
+        return (this.val * this.unit) / u.Y;
+    }
+
     inWeeks() {
         return (this.val * this.unit) / u.W;
     }
@@ -98,6 +102,10 @@ Date.prototype.minus = function (val) {
 
 // Number extensions
 
+Number.prototype.toYears = function () {
+    return timext(this, u.Y);
+}
+
 Number.prototype.toWeeks = function () {
     return timext(this, u.W);
 }

src/index.js

@@ -1,3 +1,4 @@
+export const Y = 365 * 24 * 60 * 60 * 1e3;
 export const W = 7 * 24 * 60 * 60 * 1e3;
 export const D = 24 * 60 * 60 * 1e3;
 export const H = 60 * 60 * 1e3;

src/number.extensions.js

@@ -2,7 +2,9 @@ import timext from '../src/index';
 import * as u from '../src/units';
 
 it('All conversions should work as expected', () => {
+    expect(Math.round(timext(730, u.D).inYears())).toBe(2);
     expect(Math.round(timext(21, u.D).inWeeks())).toBe(3);
+    expect(Math.round(timext(1, u.Y).inDays())).toBe(365);
     expect(Math.round(timext(2, u.W).inDays())).toBe(14);
     expect(Math.round(timext(2, u.D).inHours())).toBe(48);
     expect(Math.round(timext(2, u.H).inMinutes())).toBe(120);