date-and-time 0.4.2 → 0.6.3

package/README.md

@@ -2,13 +2,14 @@
 [![Circle CI](https://circleci.com/gh/knowledgecode/date-and-time.svg?style=shield)](https://circleci.com/gh/knowledgecode/date-and-time)  
 
 ## WHY
-[Moment.js](http://momentjs.com/), the most famous DateTime utility, is very useful. But it's also the bloated module (**16.6k** gz). If you are looking for a similar and smaller one, this would be a good solution.  
+Since JS modules are usually used in combination, we think trying to keep the size of each module small is important. This date time utility is one of the modules aiming for minimal and efficient.
 
 ## Features
 - Minimalist. Only has **1.9k** (minified and gzipped)
 - Universal (Isomorphic)
 - Multi language support
 - Not extending built-in Date object
+- Browserify support
 - Legacy IE support. IE6+
 
 ## Installation
@@ -16,7 +17,7 @@ via npm:
 ```shell
 $ npm install date-and-time --save
 ```
-via Bower:
+via Bower (DEPRECATED):
 ```shell
 $ bower install date-and-time
 ```
@@ -25,11 +26,21 @@ directly:
 <script src="date-and-time.min.js"></script>
 ```
 
+## Changes
+- `parse()`
+    - Parsing a string stricter
+    - Added white space as a wildcard character
+    - Fixed a daylight saving time issue
+
 ## Usage
 Node.js:
 ```javascript
 let date = require('date-and-time');
 ```
+babelify:
+```javascript
+import date from './date-and-time';
+```
 AMD:
 ```javascript
 require(['date-and-time'], function (date) {
@@ -40,13 +51,6 @@ the browser:
 window.date;    // global object
 ```
 
-## Breaking changes in 0.4.0
-- `parse`
-    - It comes to return a `NaN` object in case of parse error.
-    - If year is not supplied in a date string, the default year of the returning date object is `1970`.
-- `locale`
-    - Slightly changed the internal structure.
-
 ## API
 
 ### format(dateObj, formatString[, utc])
@@ -108,6 +112,7 @@ date.parse('02-01-2015', 'DD-MM-YYYY');                     // => date object
 date.parse('11:14:05 p.m.', 'hh:mm:ss A');                  // => (Jan 1 1970 23:14:05 GMT-0800)
 date.parse('11:14:05 p.m.', 'hh:mm:ss A', true);            // => (Jan 1 1970 15:14:05 GMT-0800)
 date.parse('Jam 1 2017', 'MMM D YYYY');                     // => NaN
+date.parse('Feb 29 2016', 'MMM D YYYY');                    // => date object
 date.parse('Feb 29 2017', 'MMM D YYYY');                    // => NaN
 ```
 
@@ -289,6 +294,14 @@ let date = require('date-and-time');
 date.locale('fr');  // French
 date.format(new Date(), 'dddd D MMMM'); // => 'lundi 11 janvier'
 ```
+babelify:
+```javascript
+import date from './date-and-time';
+import './locale/it';
+
+date.locale('it');  // Italian
+date.format(new Date(), 'dddd D MMMM'); // => 'Lunedì 11 gennaio'
+```
 AMD:
 ```javascript
 require(['date-and-time', 'locale/de'], function (date) {

package/date-and-time.js

@@ -71,9 +71,6 @@
                     pre: function (str) { return str; }
                 }
             }
-        },
-        isCommonJS = function () {
-            return typeof module === 'object' && typeof module.exports === 'object';
         };
 
     /**
@@ -106,6 +103,7 @@
             offset = 0, keys, i, token, length, p, str, result, dateObj,
             re = /(MMMM?|A)|(YYYY)|(SSS)|(MM|DD|HH|hh|mm|ss)|(YY|M|D|H|h|m|s|SS)|(S)|(.)/g,
             exp = { 2: /^\d{1,4}/, 3: /^\d{1,3}/, 4: /^\d\d/, 5: /^\d\d?/, 6: /^\d/ },
+            last = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
             dt = { Y: 1970, M: 1, D: 1, H: 0, m: 0, s: 0, S: 0 };
 
         while ((keys = re.exec(formatString))) {
@@ -125,6 +123,8 @@
                 result = (str.match(exp[i]) || [''])[0];
                 dt[p] = (p === 'S' ? (result + '000').slice(0, -token.length) : result) | 0;
                 length = result.length;
+            } else if (p !== ' ' && p !== str[0]) {
+                return NaN;
             }
             if (!length) {
                 return NaN;
@@ -138,9 +138,8 @@
         dt.H = dt.H || locale.parser.h(dt.h || 0, dt.A || 0);
 
         dateObj = new Date(dt.Y, dt.M - 1, dt.D, dt.H, dt.m, dt.s, dt.S);
-        if (dt.Y !== dateObj.getFullYear() || dt.M - 1 !== dateObj.getMonth() || dt.D !== dateObj.getDate()
-            || dt.H !== dateObj.getHours() || dt.m !== dateObj.getMinutes() || dt.s !== dateObj.getSeconds()
-            || dt.S !== dateObj.getMilliseconds()) {
+        last[1] += date.isLeapYear(dateObj) | 0;
+        if (dt.M < 1 || dt.M > 12 || dt.D < 1 || dt.D > last[dt.M - 1] || dt.H > 23 || dt.m > 59 || dt.s > 59) {
             return NaN;
         }
         return utc ? date.addMinutes(dateObj, -dateObj.getTimezoneOffset()) : dateObj;
@@ -287,7 +286,7 @@
      */
     date.locale = function (code) {
         if (code) {
-            if (code !== 'en' && isCommonJS()) {
+            if (!locales[code] && typeof require === 'function' && global) {
                 require('./locale/' + code);
             }
             lang = code;
@@ -297,7 +296,7 @@
 
     /**
      * getting a definition of locale
-     * @param {String} code - language code
+     * @param {String} [code] - language code
      * @returns {Object} definition of locale
      */
     date.getLocales = function (code) {
@@ -335,7 +334,7 @@
         locales[code] = locale;
     };
 
-    if (isCommonJS()) {
+    if (typeof module === 'object' && typeof module.exports === 'object') {
         module.exports = date;
     } else if (typeof define === 'function' && define.amd) {
         define([], function () {

package/date-and-time.min.js

@@ -1,13 +1,13 @@
 /*
  date-and-time.js (c) KNOWLEDGECODE | MIT
 */
-(function(u){var b={},m="en",k={en:{MMMM:"January February March April May June July August September October November December".split(" "),MMM:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),dddd:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ddd:"Sun Mon Tue Wed Thu Fri Sat".split(" "),dd:"Su Mo Tu We Th Fr Sa".split(" "),A:["a.m.","p.m."],formatter:{YYYY:function(a){return("000"+a.getFullYear()).slice(-4)},YY:function(a){return("0"+a.getFullYear()).slice(-2)},
+(function(p){var b={},n="en",k={en:{MMMM:"January February March April May June July August September October November December".split(" "),MMM:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),dddd:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ddd:"Sun Mon Tue Wed Thu Fri Sat".split(" "),dd:"Su Mo Tu We Th Fr Sa".split(" "),A:["a.m.","p.m."],formatter:{YYYY:function(a){return("000"+a.getFullYear()).slice(-4)},YY:function(a){return("0"+a.getFullYear()).slice(-2)},
 Y:function(a){return""+a.getFullYear()},MMMM:function(a){return this.MMMM[a.getMonth()]},MMM:function(a){return this.MMM[a.getMonth()]},MM:function(a){return("0"+(a.getMonth()+1)).slice(-2)},M:function(a){return""+(a.getMonth()+1)},DD:function(a){return("0"+a.getDate()).slice(-2)},D:function(a){return""+a.getDate()},HH:function(a){return("0"+a.getHours()).slice(-2)},H:function(a){return""+a.getHours()},A:function(a){return this.A[11<a.getHours()|0]},hh:function(a){return("0"+(a.getHours()%12||12)).slice(-2)},
 h:function(a){return""+(a.getHours()%12||12)},mm:function(a){return("0"+a.getMinutes()).slice(-2)},m:function(a){return""+a.getMinutes()},ss:function(a){return("0"+a.getSeconds()).slice(-2)},s:function(a){return""+a.getSeconds()},SSS:function(a){return("00"+a.getMilliseconds()).slice(-3)},SS:function(a){return("0"+(a.getMilliseconds()/10|0)).slice(-2)},S:function(a){return""+(a.getMilliseconds()/100|0)},dddd:function(a){return this.dddd[a.getDay()]},ddd:function(a){return this.ddd[a.getDay()]},dd:function(a){return this.dd[a.getDay()]},
-Z:function(a){a=a.utc?0:a.getTimezoneOffset()/.6;return(0<a?"-":"+")+("000"+Math.abs(a-a%100*.4)).slice(-4)},post:function(a){return a}},parser:{find:function(a,c){for(var b=-1,d=0,e=0,g=a.length,f;e<g;e++)f=a[e],!c.indexOf(f)&&f.length>d&&(b=e,d=f.length);return{index:b,length:d}},MMMM:function(a){return this.parser.find(this.MMMM,a)},MMM:function(a){return this.parser.find(this.MMM,a)},A:function(a){return this.parser.find(this.A,a)},h:function(a,c){return(12===a?0:a)+12*c},pre:function(a){return a}}}},
-p=function(){return"object"===typeof module&&"object"===typeof module.exports};b.format=function(a,c,n){var d=b.addMinutes(a,n?a.getTimezoneOffset():0),e=k[m],g=e.formatter;d.utc=n;return c.replace(/(\[[^\[\]]*]|\[.*\][^\[]*\]|YYYY|YY|MMM?M?|DD|HH|hh|mm|ss|SSS?|ddd?d?|.)/g,function(a){var b=g[a];return b?g.post(b.call(e,d,c)):a.replace(/\[(.*)]/,"$1")})};b.parse=function(a,c,n){var d=k[m],e=d.parser.pre(a),g=0,f,l,v=/(MMMM?|A)|(YYYY)|(SSS)|(MM|DD|HH|hh|mm|ss)|(YY|M|D|H|h|m|s|SS)|(S)|(.)/g,p={2:/^\d{1,4}/,
-3:/^\d{1,3}/,4:/^\d\d/,5:/^\d\d?/,6:/^\d/};for(a={Y:1970,M:1,D:1,H:0,m:0,s:0,S:0};f=v.exec(c);){var q=0;var r=1;for(l="";!l;)l=f[++q];f=l.charAt(0);var t=e.slice(g);if(2>q){var h=d.parser[l].call(d,t,c);a[f]=h.index;"M"===f&&a[f]++;r=h.length}else 7>q&&(h=(t.match(p[q])||[""])[0],a[f]=("S"===f?(h+"000").slice(0,-l.length):h)|0,r=h.length);if(!r)return NaN;g+=r}if(g!==e.length||!h)return NaN;a.Y+=70>a.Y?2E3:100>a.Y?1900:0;a.H=a.H||d.parser.h(a.h||0,a.A||0);c=new Date(a.Y,a.M-1,a.D,a.H,a.m,a.s,a.S);
-return a.Y!==c.getFullYear()||a.M-1!==c.getMonth()||a.D!==c.getDate()||a.H!==c.getHours()||a.m!==c.getMinutes()||a.s!==c.getSeconds()||a.S!==c.getMilliseconds()?NaN:n?b.addMinutes(c,-c.getTimezoneOffset()):c};b.isValid=function(a,c){return!!b.parse(a,c)};b.addYears=function(a,c){return b.addMonths(a,12*c)};b.addMonths=function(a,c){var b=new Date(a.getTime());b.setMonth(b.getMonth()+c);return b};b.addDays=function(a,c){var b=new Date(a.getTime());b.setDate(b.getDate()+c);return b};b.addHours=function(a,
-c){return b.addMilliseconds(a,36E5*c)};b.addMinutes=function(a,c){return b.addMilliseconds(a,6E4*c)};b.addSeconds=function(a,c){return b.addMilliseconds(a,1E3*c)};b.addMilliseconds=function(a,c){return new Date(a.getTime()+c)};b.subtract=function(a,c){var b=a.getTime()-c.getTime();return{toMilliseconds:function(){return b},toSeconds:function(){return b/1E3|0},toMinutes:function(){return b/6E4|0},toHours:function(){return b/36E5|0},toDays:function(){return b/864E5|0}}};b.isLeapYear=function(a){a=a.getFullYear();
-return!(a%4)&&!!(a%100)||!(a%400)};b.isSameDay=function(a,c){return b.format(a,"YYYYMMDD")===b.format(c,"YYYYMMDD")};b.locale=function(a){a&&("en"!==a&&p()&&require("./locale/"+a),m=a);return m};b.getLocales=function(a){return k[a||m]};b.setLocales=function(a,b){var c=function(a,b){var c=function(){},d;c.prototype=b;c=new c;for(d in a)a.hasOwnProperty(d)&&(c[d]=a[d]);return c},d=k[a]||k.en,e=c(b,d);b.formatter&&(e.formatter=c(b.formatter,d.formatter));b.parser&&(e.parser=c(b.parser,d.parser));k[a]=
-e};p()?module.exports=b:"function"===typeof define&&define.amd?define([],function(){return b}):u.date=b})(this);
+Z:function(a){a=a.utc?0:a.getTimezoneOffset()/.6;return(0<a?"-":"+")+("000"+Math.abs(a-a%100*.4)).slice(-4)},post:function(a){return a}},parser:{find:function(a,c){for(var b=-1,e=0,g=0,h=a.length,f;g<h;g++)f=a[g],!c.indexOf(f)&&f.length>e&&(b=g,e=f.length);return{index:b,length:e}},MMMM:function(a){return this.parser.find(this.MMMM,a)},MMM:function(a){return this.parser.find(this.MMM,a)},A:function(a){return this.parser.find(this.A,a)},h:function(a,c){return(12===a?0:a)+12*c},pre:function(a){return a}}}};
+b.format=function(a,c,q){var e=b.addMinutes(a,q?a.getTimezoneOffset():0),g=k[n],h=g.formatter;e.utc=q;return c.replace(/(\[[^\[\]]*]|\[.*\][^\[]*\]|YYYY|YY|MMM?M?|DD|HH|hh|mm|ss|SSS?|ddd?d?|.)/g,function(a){var b=h[a];return b?h.post(b.call(g,e,c)):a.replace(/\[(.*)]/,"$1")})};b.parse=function(a,c,q){var e=k[n],g=e.parser.pre(a),h=0,f,m,v=/(MMMM?|A)|(YYYY)|(SSS)|(MM|DD|HH|hh|mm|ss)|(YY|M|D|H|h|m|s|SS)|(S)|(.)/g,p={2:/^\d{1,4}/,3:/^\d{1,3}/,4:/^\d\d/,5:/^\d\d?/,6:/^\d/};a=[31,28,31,30,31,30,31,31,
+30,31,30,31];for(var d={Y:1970,M:1,D:1,H:0,m:0,s:0,S:0};f=v.exec(c);){var r=0;var t=1;for(m="";!m;)m=f[++r];f=m.charAt(0);var u=g.slice(h);if(2>r){var l=e.parser[m].call(e,u,c);d[f]=l.index;"M"===f&&d[f]++;t=l.length}else if(7>r)l=(u.match(p[r])||[""])[0],d[f]=("S"===f?(l+"000").slice(0,-m.length):l)|0,t=l.length;else if(" "!==f&&f!==u[0])return NaN;if(!t)return NaN;h+=t}if(h!==g.length||!l)return NaN;d.Y+=70>d.Y?2E3:100>d.Y?1900:0;d.H=d.H||e.parser.h(d.h||0,d.A||0);c=new Date(d.Y,d.M-1,d.D,d.H,d.m,
+d.s,d.S);a[1]+=b.isLeapYear(c)|0;return 1>d.M||12<d.M||1>d.D||d.D>a[d.M-1]||23<d.H||59<d.m||59<d.s?NaN:q?b.addMinutes(c,-c.getTimezoneOffset()):c};b.isValid=function(a,c){return!!b.parse(a,c)};b.addYears=function(a,c){return b.addMonths(a,12*c)};b.addMonths=function(a,c){var b=new Date(a.getTime());b.setMonth(b.getMonth()+c);return b};b.addDays=function(a,c){var b=new Date(a.getTime());b.setDate(b.getDate()+c);return b};b.addHours=function(a,c){return b.addMilliseconds(a,36E5*c)};b.addMinutes=function(a,
+c){return b.addMilliseconds(a,6E4*c)};b.addSeconds=function(a,c){return b.addMilliseconds(a,1E3*c)};b.addMilliseconds=function(a,b){return new Date(a.getTime()+b)};b.subtract=function(a,b){var c=a.getTime()-b.getTime();return{toMilliseconds:function(){return c},toSeconds:function(){return c/1E3|0},toMinutes:function(){return c/6E4|0},toHours:function(){return c/36E5|0},toDays:function(){return c/864E5|0}}};b.isLeapYear=function(a){a=a.getFullYear();return!(a%4)&&!!(a%100)||!(a%400)};b.isSameDay=function(a,
+c){return b.format(a,"YYYYMMDD")===b.format(c,"YYYYMMDD")};b.locale=function(a){a&&(!k[a]&&"function"===typeof require&&p&&require("./locale/"+a),n=a);return n};b.getLocales=function(a){return k[a||n]};b.setLocales=function(a,b){var c=function(a,b){var c=function(){},e;c.prototype=b;c=new c;for(e in a)a.hasOwnProperty(e)&&(c[e]=a[e]);return c},e=k[a]||k.en,g=c(b,e);b.formatter&&(g.formatter=c(b.formatter,e.formatter));b.parser&&(g.parser=c(b.parser,e.parser));k[a]=g};"object"===typeof module&&"object"===
+typeof module.exports?module.exports=b:"function"===typeof define&&define.amd?define([],function(){return b}):p.date=b})(this);

package/locale/es.js

@@ -8,11 +8,11 @@
 
     var locale = function (date) {
         date.setLocales('es', {
-            MMMM: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
-            MMM: ['ene.', 'feb.', 'mar.', 'abr.', 'may.', 'jun.', 'jul.', 'ago.', 'sep.', 'oct.', 'nov.', 'dic.'],
-            dddd: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado'],
-            ddd: ['dom.', 'lun.', 'mar.', 'mié.', 'jue.', 'vie.', 'sáb.'],
-            dd: ['do', 'lu', 'ma', 'mi', 'ju', 'vi', 'sá'],
+            MMMM: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
+            MMM: ['Ene.', 'Feb.', 'Mar.', 'Abr.', 'May.', 'Jun.', 'Jul.', 'Ago.', 'Sep.', 'Oct.', 'Nov.', 'Dic.'],
+            dddd: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'],
+            ddd: ['Dom.', 'Lun.', 'Mar.', 'Mié.', 'Jue.', 'Vie.', 'Sáb.'],
+            dd: ['Do', 'Lu', 'Ma', 'Mi', 'Ju', 'Vi', 'Sá'],
             A: ['de la mañana', 'de la tarde', 'de la noche'],
             formatter: {
                 A: function (d) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "date-and-time",
-  "version": "0.4.2",
+  "version": "0.6.3",
   "description": "A Minimalist DateTime utility for Node.js and the browser",
   "main": "date-and-time.js",
   "scripts": {
@@ -25,9 +25,12 @@
   },
   "homepage": "https://github.com/knowledgecode/date-and-time",
   "devDependencies": {
+    "babel-preset-env": "^1.7.0",
+    "babelify": "^7.3.0",
+    "browserify": "^14.5.0",
     "expect.js": "^0.3.1",
-    "mocha": "^3.4.2",
-    "mocha-phantomjs": "^4.1.0",
-    "phantomjs": "^2.1.7"
+    "mocha": "^5.2.0",
+    "mocha-phantomjs-core": "^2.1.2",
+    "phantomjs-prebuilt": "^2.1.16"
   }
 }