d3-time-format - npm Package Compare versions

Comparing version 2.2.3 to 2.3.0

dist/d3-time-format.js

@@ -1,2 +0,2 @@
-// https://d3js.org/d3-time-format/ v2.2.3 Copyright 2019 Mike Bostock
+// https://d3js.org/d3-time-format/ v2.3.0 Copyright 2020 Mike Bostock
 (function (global, factory) {
@@ -60,2 +60,4 @@ typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('d3-time')) :
     "f": formatMicroseconds,
+    "g": formatYearISO,
+    "G": formatFullYearISO,
     "H": formatHour24,
@@ -94,2 +96,4 @@ "I": formatHour12,
     "f": formatUTCMicroseconds,
+    "g": formatUTCYearISO,
+    "G": formatUTCFullYearISO,
     "H": formatUTCHour24,
@@ -128,2 +132,4 @@ "I": formatUTCHour12,
     "f": parseMicroseconds,
+    "g": parseYear,
+    "G": parseFullYear,
     "H": parseHour24,
@@ -550,5 +556,9 @@ "I": parseHour24,
 
+function dISO(d) {
+  var day = d.getDay();
+  return (day >= 4 || day === 0) ? d3Time.timeThursday(d) : d3Time.timeThursday.ceil(d);
+}
+
 function formatWeekNumberISO(d, p) {
-  var day = d.getDay();
-  d = (day >= 4 || day === 0) ? d3Time.timeThursday(d) : d3Time.timeThursday.ceil(d);
+  d = dISO(d);
   return pad(d3Time.timeThursday.count(d3Time.timeYear(d), d) + (d3Time.timeYear(d).getDay() === 4), p, 2);
@@ -569,2 +579,7 @@ }
 
+function formatYearISO(d, p) {
+  d = dISO(d);
+  return pad(d.getFullYear() % 100, p, 2);
+}
+
 function formatFullYear(d, p) {
@@ -574,2 +589,8 @@ return pad(d.getFullYear() % 10000, p, 4);
 
+function formatFullYearISO(d, p) {
+  var day = d.getDay();
+  d = (day >= 4 || day === 0) ? d3Time.timeThursday(d) : d3Time.timeThursday.ceil(d);
+  return pad(d.getFullYear() % 10000, p, 4);
+}
+
 function formatZone(d) {
@@ -627,5 +648,9 @@ var z = d.getTimezoneOffset();
 
+function UTCdISO(d) {
+  var day = d.getUTCDay();
+  return (day >= 4 || day === 0) ? d3Time.utcThursday(d) : d3Time.utcThursday.ceil(d);
+}
+
 function formatUTCWeekNumberISO(d, p) {
-  var day = d.getUTCDay();
-  d = (day >= 4 || day === 0) ? d3Time.utcThursday(d) : d3Time.utcThursday.ceil(d);
+  d = UTCdISO(d);
   return pad(d3Time.utcThursday.count(d3Time.utcYear(d), d) + (d3Time.utcYear(d).getUTCDay() === 4), p, 2);
@@ -646,2 +671,7 @@ }
 
+function formatUTCYearISO(d, p) {
+  d = UTCdISO(d);
+  return pad(d.getUTCFullYear() % 100, p, 2);
+}
+
 function formatUTCFullYear(d, p) {
@@ -651,2 +681,8 @@ return pad(d.getUTCFullYear() % 10000, p, 4);
 
+function formatUTCFullYearISO(d, p) {
+  var day = d.getUTCDay();
+  d = (day >= 4 || day === 0) ? d3Time.utcThursday(d) : d3Time.utcThursday.ceil(d);
+  return pad(d.getUTCFullYear() % 10000, p, 4);
+}
+
 function formatUTCZone() {
@@ -653,0 +689,0 @@ return "+0000";

dist/d3-time-format.min.js

@@ -1,2 +0,2 @@
-// https://d3js.org/d3-time-format/ v2.2.3 Copyright 2019 Mike Bostock
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("d3-time")):"function"==typeof define&&define.amd?define(["exports","d3-time"],n):n((e=e||self).d3=e.d3||{},e.d3)}(this,function(e,n){"use strict";function t(e){if(0<=e.y&&e.y<100){var n=new Date(-1,e.m,e.d,e.H,e.M,e.S,e.L);return n.setFullYear(e.y),n}return new Date(e.y,e.m,e.d,e.H,e.M,e.S,e.L)}function r(e){if(0<=e.y&&e.y<100){var n=new Date(Date.UTC(-1,e.m,e.d,e.H,e.M,e.S,e.L));return n.setUTCFullYear(e.y),n}return new Date(Date.UTC(e.y,e.m,e.d,e.H,e.M,e.S,e.L))}function u(e,n,t){return{y:e,m:n,d:t,H:0,M:0,S:0,L:0}}function i(e){var i=e.dateTime,c=e.date,a=e.time,f=e.periods,l=e.days,s=e.shortDays,g=e.months,Me=e.shortMonths,Te=y(f),De=d(f),Ce=y(l),xe=d(l),Ue=y(s),we=d(s),pe=y(g),Se=d(g),Ye=y(Me),Le=d(Me),Fe={a:function(e){return s[e.getDay()]},A:function(e){return l[e.getDay()]},b:function(e){return Me[e.getMonth()]},B:function(e){return g[e.getMonth()]},c:null,d:V,e:V,f:J,H:j,I:P,j:q,L:I,m:O,M:Q,p:function(e){return f[+(e.getHours()>=12)]},q:function(e){return 1+~~(e.getMonth()/3)},Q:me,s:ve,S:X,u:N,U:B,V:_,w:$,W:z,x:null,X:null,y:E,Y:R,Z:k,"%":he},He={a:function(e){return s[e.getUTCDay()]},A:function(e){return l[e.getUTCDay()]},b:function(e){return Me[e.getUTCMonth()]},B:function(e){return g[e.getUTCMonth()]},c:null,d:G,e:G,f:re,H:K,I:ee,j:ne,L:te,m:ue,M:ie,p:function(e){return f[+(e.getUTCHours()>=12)]},q:function(e){return 1+~~(e.getUTCMonth()/3)},Q:me,s:ve,S:ce,u:oe,U:ae,V:fe,w:le,W:se,x:null,X:null,y:ge,Y:ye,Z:de,"%":he},Ae={a:function(e,n,t){var r=Ue.exec(n.slice(t));return r?(e.w=we[r[0].toLowerCase()],t+r[0].length):-1},A:function(e,n,t){var r=Ce.exec(n.slice(t));return r?(e.w=xe[r[0].toLowerCase()],t+r[0].length):-1},b:function(e,n,t){var r=Ye.exec(n.slice(t));return r?(e.m=Le[r[0].toLowerCase()],t+r[0].length):-1},B:function(e,n,t){var r=pe.exec(n.slice(t));return r?(e.m=Se[r[0].toLowerCase()],t+r[0].length):-1},c:function(e,n,t){return We(e,i,n,t)},d:p,e:p,f:A,H:Y,I:Y,j:S,L:H,m:w,M:L,p:function(e,n,t){var r=Te.exec(n.slice(t));return r?(e.p=De[r[0].toLowerCase()],t+r[0].length):-1},q:U,Q:b,s:W,S:F,u:m,U:v,V:M,w:h,W:T,x:function(e,n,t){return We(e,c,n,t)},X:function(e,n,t){return We(e,a,n,t)},y:C,Y:D,Z:x,"%":Z};function Ze(e,n){return function(t){var r,u,i,c=[],a=-1,f=0,l=e.length;for(t instanceof Date||(t=new Date(+t));++a<l;)37===e.charCodeAt(a)&&(c.push(e.slice(f,a)),null!=(u=o[r=e.charAt(++a)])?r=e.charAt(++a):u="e"===r?" ":"0",(i=n[r])&&(r=i(t,u)),c.push(r),f=a+1);return c.push(e.slice(f,a)),c.join("")}}function be(e,i){return function(c){var o,a,f=u(1900,void 0,1);if(We(f,e,c+="",0)!=c.length)return null;if("Q"in f)return new Date(f.Q);if("s"in f)return new Date(1e3*f.s+("L"in f?f.L:0));if(!i||"Z"in f||(f.Z=0),"p"in f&&(f.H=f.H%12+12*f.p),void 0===f.m&&(f.m="q"in f?f.q:0),"V"in f){if(f.V<1||f.V>53)return null;"w"in f||(f.w=1),"Z"in f?(a=(o=r(u(f.y,0,1))).getUTCDay(),o=a>4||0===a?n.utcMonday.ceil(o):n.utcMonday(o),o=n.utcDay.offset(o,7*(f.V-1)),f.y=o.getUTCFullYear(),f.m=o.getUTCMonth(),f.d=o.getUTCDate()+(f.w+6)%7):(a=(o=t(u(f.y,0,1))).getDay(),o=a>4||0===a?n.timeMonday.ceil(o):n.timeMonday(o),o=n.timeDay.offset(o,7*(f.V-1)),f.y=o.getFullYear(),f.m=o.getMonth(),f.d=o.getDate()+(f.w+6)%7)}else("W"in f||"U"in f)&&("w"in f||(f.w="u"in f?f.u%7:"W"in f?1:0),a="Z"in f?r(u(f.y,0,1)).getUTCDay():t(u(f.y,0,1)).getDay(),f.m=0,f.d="W"in f?(f.w+6)%7+7*f.W-(a+5)%7:f.w+7*f.U-(a+6)%7);return"Z"in f?(f.H+=f.Z/100|0,f.M+=f.Z%100,r(f)):t(f)}}function We(e,n,t,r){for(var u,i,c=0,a=n.length,f=t.length;c<a;){if(r>=f)return-1;if(37===(u=n.charCodeAt(c++))){if(u=n.charAt(c++),!(i=Ae[u in o?n.charAt(c++):u])||(r=i(e,t,r))<0)return-1}else if(u!=t.charCodeAt(r++))return-1}return r}return Fe.x=Ze(c,Fe),Fe.X=Ze(a,Fe),Fe.c=Ze(i,Fe),He.x=Ze(c,He),He.X=Ze(a,He),He.c=Ze(i,He),{format:function(e){var n=Ze(e+="",Fe);return n.toString=function(){return e},n},parse:function(e){var n=be(e+="",!1);return n.toString=function(){return e},n},utcFormat:function(e){var n=Ze(e+="",He);return n.toString=function(){return e},n},utcParse:function(e){var n=be(e+="",!0);return n.toString=function(){return e},n}}}var c,o={"-":"",_:" ",0:"0"},a=/^\s*\d+/,f=/^%/,l=/[\\^$*+?|[\]().{}]/g;function s(e,n,t){var r=e<0?"-":"",u=(r?-e:e)+"",i=u.length;return r+(i<t?new Array(t-i+1).join(n)+u:u)}function g(e){return e.replace(l,"\\$&")}function y(e){return new RegExp("^(?:"+e.map(g).join("|")+")","i")}function d(e){for(var n={},t=-1,r=e.length;++t<r;)n[e[t].toLowerCase()]=t;return n}function h(e,n,t){var r=a.exec(n.slice(t,t+1));return r?(e.w=+r[0],t+r[0].length):-1}function m(e,n,t){var r=a.exec(n.slice(t,t+1));return r?(e.u=+r[0],t+r[0].length):-1}function v(e,n,t){var r=a.exec(n.slice(t,t+2));return r?(e.U=+r[0],t+r[0].length):-1}function M(e,n,t){var r=a.exec(n.slice(t,t+2));return r?(e.V=+r[0],t+r[0].length):-1}function T(e,n,t){var r=a.exec(n.slice(t,t+2));return r?(e.W=+r[0],t+r[0].length):-1}function D(e,n,t){var r=a.exec(n.slice(t,t+4));return r?(e.y=+r[0],t+r[0].length):-1}function C(e,n,t){var r=a.exec(n.slice(t,t+2));return r?(e.y=+r[0]+(+r[0]>68?1900:2e3),t+r[0].length):-1}function x(e,n,t){var r=/^(Z)|([+-]\d\d)(?::?(\d\d))?/.exec(n.slice(t,t+6));return r?(e.Z=r[1]?0:-(r[2]+(r[3]||"00")),t+r[0].length):-1}function U(e,n,t){var r=a.exec(n.slice(t,t+1));return r?(e.q=3*r[0]-3,t+r[0].length):-1}function w(e,n,t){var r=a.exec(n.slice(t,t+2));return r?(e.m=r[0]-1,t+r[0].length):-1}function p(e,n,t){var r=a.exec(n.slice(t,t+2));return r?(e.d=+r[0],t+r[0].length):-1}function S(e,n,t){var r=a.exec(n.slice(t,t+3));return r?(e.m=0,e.d=+r[0],t+r[0].length):-1}function Y(e,n,t){var r=a.exec(n.slice(t,t+2));return r?(e.H=+r[0],t+r[0].length):-1}function L(e,n,t){var r=a.exec(n.slice(t,t+2));return r?(e.M=+r[0],t+r[0].length):-1}function F(e,n,t){var r=a.exec(n.slice(t,t+2));return r?(e.S=+r[0],t+r[0].length):-1}function H(e,n,t){var r=a.exec(n.slice(t,t+3));return r?(e.L=+r[0],t+r[0].length):-1}function A(e,n,t){var r=a.exec(n.slice(t,t+6));return r?(e.L=Math.floor(r[0]/1e3),t+r[0].length):-1}function Z(e,n,t){var r=f.exec(n.slice(t,t+1));return r?t+r[0].length:-1}function b(e,n,t){var r=a.exec(n.slice(t));return r?(e.Q=+r[0],t+r[0].length):-1}function W(e,n,t){var r=a.exec(n.slice(t));return r?(e.s=+r[0],t+r[0].length):-1}function V(e,n){return s(e.getDate(),n,2)}function j(e,n){return s(e.getHours(),n,2)}function P(e,n){return s(e.getHours()%12||12,n,2)}function q(e,t){return s(1+n.timeDay.count(n.timeYear(e),e),t,3)}function I(e,n){return s(e.getMilliseconds(),n,3)}function J(e,n){return I(e,n)+"000"}function O(e,n){return s(e.getMonth()+1,n,2)}function Q(e,n){return s(e.getMinutes(),n,2)}function X(e,n){return s(e.getSeconds(),n,2)}function N(e){var n=e.getDay();return 0===n?7:n}function B(e,t){return s(n.timeSunday.count(n.timeYear(e)-1,e),t,2)}function _(e,t){var r=e.getDay();return e=r>=4||0===r?n.timeThursday(e):n.timeThursday.ceil(e),s(n.timeThursday.count(n.timeYear(e),e)+(4===n.timeYear(e).getDay()),t,2)}function $(e){return e.getDay()}function z(e,t){return s(n.timeMonday.count(n.timeYear(e)-1,e),t,2)}function E(e,n){return s(e.getFullYear()%100,n,2)}function R(e,n){return s(e.getFullYear()%1e4,n,4)}function k(e){var n=e.getTimezoneOffset();return(n>0?"-":(n*=-1,"+"))+s(n/60|0,"0",2)+s(n%60,"0",2)}function G(e,n){return s(e.getUTCDate(),n,2)}function K(e,n){return s(e.getUTCHours(),n,2)}function ee(e,n){return s(e.getUTCHours()%12||12,n,2)}function ne(e,t){return s(1+n.utcDay.count(n.utcYear(e),e),t,3)}function te(e,n){return s(e.getUTCMilliseconds(),n,3)}function re(e,n){return te(e,n)+"000"}function ue(e,n){return s(e.getUTCMonth()+1,n,2)}function ie(e,n){return s(e.getUTCMinutes(),n,2)}function ce(e,n){return s(e.getUTCSeconds(),n,2)}function oe(e){var n=e.getUTCDay();return 0===n?7:n}function ae(e,t){return s(n.utcSunday.count(n.utcYear(e)-1,e),t,2)}function fe(e,t){var r=e.getUTCDay();return e=r>=4||0===r?n.utcThursday(e):n.utcThursday.ceil(e),s(n.utcThursday.count(n.utcYear(e),e)+(4===n.utcYear(e).getUTCDay()),t,2)}function le(e){return e.getUTCDay()}function se(e,t){return s(n.utcMonday.count(n.utcYear(e)-1,e),t,2)}function ge(e,n){return s(e.getUTCFullYear()%100,n,2)}function ye(e,n){return s(e.getUTCFullYear()%1e4,n,4)}function de(){return"+0000"}function he(){return"%"}function me(e){return+e}function ve(e){return Math.floor(+e/1e3)}function Me(n){return c=i(n),e.timeFormat=c.format,e.timeParse=c.parse,e.utcFormat=c.utcFormat,e.utcParse=c.utcParse,c}Me({dateTime:"%x, %X",date:"%-m/%-d/%Y",time:"%-I:%M:%S %p",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});var Te=Date.prototype.toISOString?function(e){return e.toISOString()}:e.utcFormat("%Y-%m-%dT%H:%M:%S.%LZ");var De=+new Date("2000-01-01T00:00:00.000Z")?function(e){var n=new Date(e);return isNaN(n)?null:n}:e.utcParse("%Y-%m-%dT%H:%M:%S.%LZ");e.isoFormat=Te,e.isoParse=De,e.timeFormatDefaultLocale=Me,e.timeFormatLocale=i,Object.defineProperty(e,"__esModule",{value:!0})});
+// https://d3js.org/d3-time-format/ v2.3.0 Copyright 2020 Mike Bostock
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("d3-time")):"function"==typeof define&&define.amd?define(["exports","d3-time"],t):t((e=e||self).d3=e.d3||{},e.d3)}(this,function(e,t){"use strict";function n(e){if(0<=e.y&&e.y<100){var t=new Date(-1,e.m,e.d,e.H,e.M,e.S,e.L);return t.setFullYear(e.y),t}return new Date(e.y,e.m,e.d,e.H,e.M,e.S,e.L)}function r(e){if(0<=e.y&&e.y<100){var t=new Date(Date.UTC(-1,e.m,e.d,e.H,e.M,e.S,e.L));return t.setUTCFullYear(e.y),t}return new Date(Date.UTC(e.y,e.m,e.d,e.H,e.M,e.S,e.L))}function u(e,t,n){return{y:e,m:t,d:n,H:0,M:0,S:0,L:0}}function i(e){var i=e.dateTime,c=e.date,a=e.time,f=e.periods,l=e.days,s=e.shortDays,g=e.months,G=e.shortMonths,ge=y(f),we=d(f),pe=y(l),Se=d(l),Ye=y(s),Fe=d(s),Le=y(g),He=d(g),Ae=y(G),Ze=d(G),be={a:function(e){return s[e.getDay()]},A:function(e){return l[e.getDay()]},b:function(e){return G[e.getMonth()]},B:function(e){return g[e.getMonth()]},c:null,d:V,e:V,f:J,g:R,G:K,H:j,I:P,j:q,L:I,m:O,M:Q,p:function(e){return f[+(e.getHours()>=12)]},q:function(e){return 1+~~(e.getMonth()/3)},Q:Ue,s:xe,S:X,u:N,U:B,V:_,w:$,W:z,x:null,X:null,y:E,Y:k,Z:ee,"%":Ce},We={a:function(e){return s[e.getUTCDay()]},A:function(e){return l[e.getUTCDay()]},b:function(e){return G[e.getUTCMonth()]},B:function(e){return g[e.getUTCMonth()]},c:null,d:te,e:te,f:ce,g:ve,G:Me,H:ne,I:re,j:ue,L:ie,m:oe,M:ae,p:function(e){return f[+(e.getUTCHours()>=12)]},q:function(e){return 1+~~(e.getUTCMonth()/3)},Q:Ue,s:xe,S:fe,u:le,U:se,V:ye,w:de,W:he,x:null,X:null,y:me,Y:Te,Z:De,"%":Ce},Ve={a:function(e,t,n){var r=Ye.exec(t.slice(n));return r?(e.w=Fe[r[0].toLowerCase()],n+r[0].length):-1},A:function(e,t,n){var r=pe.exec(t.slice(n));return r?(e.w=Se[r[0].toLowerCase()],n+r[0].length):-1},b:function(e,t,n){var r=Ae.exec(t.slice(n));return r?(e.m=Ze[r[0].toLowerCase()],n+r[0].length):-1},B:function(e,t,n){var r=Le.exec(t.slice(n));return r?(e.m=He[r[0].toLowerCase()],n+r[0].length):-1},c:function(e,t,n){return qe(e,i,t,n)},d:p,e:p,f:A,g:C,G:D,H:Y,I:Y,j:S,L:H,m:w,M:F,p:function(e,t,n){var r=ge.exec(t.slice(n));return r?(e.p=we[r[0].toLowerCase()],n+r[0].length):-1},q:x,Q:b,s:W,S:L,u:m,U:v,V:T,w:h,W:M,x:function(e,t,n){return qe(e,c,t,n)},X:function(e,t,n){return qe(e,a,t,n)},y:C,Y:D,Z:U,"%":Z};function je(e,t){return function(n){var r,u,i,c=[],a=-1,f=0,l=e.length;for(n instanceof Date||(n=new Date(+n));++a<l;)37===e.charCodeAt(a)&&(c.push(e.slice(f,a)),null!=(u=o[r=e.charAt(++a)])?r=e.charAt(++a):u="e"===r?" ":"0",(i=t[r])&&(r=i(n,u)),c.push(r),f=a+1);return c.push(e.slice(f,a)),c.join("")}}function Pe(e,i){return function(c){var o,a,f=u(1900,void 0,1);if(qe(f,e,c+="",0)!=c.length)return null;if("Q"in f)return new Date(f.Q);if("s"in f)return new Date(1e3*f.s+("L"in f?f.L:0));if(!i||"Z"in f||(f.Z=0),"p"in f&&(f.H=f.H%12+12*f.p),void 0===f.m&&(f.m="q"in f?f.q:0),"V"in f){if(f.V<1||f.V>53)return null;"w"in f||(f.w=1),"Z"in f?(a=(o=r(u(f.y,0,1))).getUTCDay(),o=a>4||0===a?t.utcMonday.ceil(o):t.utcMonday(o),o=t.utcDay.offset(o,7*(f.V-1)),f.y=o.getUTCFullYear(),f.m=o.getUTCMonth(),f.d=o.getUTCDate()+(f.w+6)%7):(a=(o=n(u(f.y,0,1))).getDay(),o=a>4||0===a?t.timeMonday.ceil(o):t.timeMonday(o),o=t.timeDay.offset(o,7*(f.V-1)),f.y=o.getFullYear(),f.m=o.getMonth(),f.d=o.getDate()+(f.w+6)%7)}else("W"in f||"U"in f)&&("w"in f||(f.w="u"in f?f.u%7:"W"in f?1:0),a="Z"in f?r(u(f.y,0,1)).getUTCDay():n(u(f.y,0,1)).getDay(),f.m=0,f.d="W"in f?(f.w+6)%7+7*f.W-(a+5)%7:f.w+7*f.U-(a+6)%7);return"Z"in f?(f.H+=f.Z/100|0,f.M+=f.Z%100,r(f)):n(f)}}function qe(e,t,n,r){for(var u,i,c=0,a=t.length,f=n.length;c<a;){if(r>=f)return-1;if(37===(u=t.charCodeAt(c++))){if(u=t.charAt(c++),!(i=Ve[u in o?t.charAt(c++):u])||(r=i(e,n,r))<0)return-1}else if(u!=n.charCodeAt(r++))return-1}return r}return be.x=je(c,be),be.X=je(a,be),be.c=je(i,be),We.x=je(c,We),We.X=je(a,We),We.c=je(i,We),{format:function(e){var t=je(e+="",be);return t.toString=function(){return e},t},parse:function(e){var t=Pe(e+="",!1);return t.toString=function(){return e},t},utcFormat:function(e){var t=je(e+="",We);return t.toString=function(){return e},t},utcParse:function(e){var t=Pe(e+="",!0);return t.toString=function(){return e},t}}}var c,o={"-":"",_:" ",0:"0"},a=/^\s*\d+/,f=/^%/,l=/[\\^$*+?|[\]().{}]/g;function s(e,t,n){var r=e<0?"-":"",u=(r?-e:e)+"",i=u.length;return r+(i<n?new Array(n-i+1).join(t)+u:u)}function g(e){return e.replace(l,"\\$&")}function y(e){return new RegExp("^(?:"+e.map(g).join("|")+")","i")}function d(e){for(var t={},n=-1,r=e.length;++n<r;)t[e[n].toLowerCase()]=n;return t}function h(e,t,n){var r=a.exec(t.slice(n,n+1));return r?(e.w=+r[0],n+r[0].length):-1}function m(e,t,n){var r=a.exec(t.slice(n,n+1));return r?(e.u=+r[0],n+r[0].length):-1}function v(e,t,n){var r=a.exec(t.slice(n,n+2));return r?(e.U=+r[0],n+r[0].length):-1}function T(e,t,n){var r=a.exec(t.slice(n,n+2));return r?(e.V=+r[0],n+r[0].length):-1}function M(e,t,n){var r=a.exec(t.slice(n,n+2));return r?(e.W=+r[0],n+r[0].length):-1}function D(e,t,n){var r=a.exec(t.slice(n,n+4));return r?(e.y=+r[0],n+r[0].length):-1}function C(e,t,n){var r=a.exec(t.slice(n,n+2));return r?(e.y=+r[0]+(+r[0]>68?1900:2e3),n+r[0].length):-1}function U(e,t,n){var r=/^(Z)|([+-]\d\d)(?::?(\d\d))?/.exec(t.slice(n,n+6));return r?(e.Z=r[1]?0:-(r[2]+(r[3]||"00")),n+r[0].length):-1}function x(e,t,n){var r=a.exec(t.slice(n,n+1));return r?(e.q=3*r[0]-3,n+r[0].length):-1}function w(e,t,n){var r=a.exec(t.slice(n,n+2));return r?(e.m=r[0]-1,n+r[0].length):-1}function p(e,t,n){var r=a.exec(t.slice(n,n+2));return r?(e.d=+r[0],n+r[0].length):-1}function S(e,t,n){var r=a.exec(t.slice(n,n+3));return r?(e.m=0,e.d=+r[0],n+r[0].length):-1}function Y(e,t,n){var r=a.exec(t.slice(n,n+2));return r?(e.H=+r[0],n+r[0].length):-1}function F(e,t,n){var r=a.exec(t.slice(n,n+2));return r?(e.M=+r[0],n+r[0].length):-1}function L(e,t,n){var r=a.exec(t.slice(n,n+2));return r?(e.S=+r[0],n+r[0].length):-1}function H(e,t,n){var r=a.exec(t.slice(n,n+3));return r?(e.L=+r[0],n+r[0].length):-1}function A(e,t,n){var r=a.exec(t.slice(n,n+6));return r?(e.L=Math.floor(r[0]/1e3),n+r[0].length):-1}function Z(e,t,n){var r=f.exec(t.slice(n,n+1));return r?n+r[0].length:-1}function b(e,t,n){var r=a.exec(t.slice(n));return r?(e.Q=+r[0],n+r[0].length):-1}function W(e,t,n){var r=a.exec(t.slice(n));return r?(e.s=+r[0],n+r[0].length):-1}function V(e,t){return s(e.getDate(),t,2)}function j(e,t){return s(e.getHours(),t,2)}function P(e,t){return s(e.getHours()%12||12,t,2)}function q(e,n){return s(1+t.timeDay.count(t.timeYear(e),e),n,3)}function I(e,t){return s(e.getMilliseconds(),t,3)}function J(e,t){return I(e,t)+"000"}function O(e,t){return s(e.getMonth()+1,t,2)}function Q(e,t){return s(e.getMinutes(),t,2)}function X(e,t){return s(e.getSeconds(),t,2)}function N(e){var t=e.getDay();return 0===t?7:t}function B(e,n){return s(t.timeSunday.count(t.timeYear(e)-1,e),n,2)}function G(e){var n=e.getDay();return n>=4||0===n?t.timeThursday(e):t.timeThursday.ceil(e)}function _(e,n){return e=G(e),s(t.timeThursday.count(t.timeYear(e),e)+(4===t.timeYear(e).getDay()),n,2)}function $(e){return e.getDay()}function z(e,n){return s(t.timeMonday.count(t.timeYear(e)-1,e),n,2)}function E(e,t){return s(e.getFullYear()%100,t,2)}function R(e,t){return s((e=G(e)).getFullYear()%100,t,2)}function k(e,t){return s(e.getFullYear()%1e4,t,4)}function K(e,n){var r=e.getDay();return s((e=r>=4||0===r?t.timeThursday(e):t.timeThursday.ceil(e)).getFullYear()%1e4,n,4)}function ee(e){var t=e.getTimezoneOffset();return(t>0?"-":(t*=-1,"+"))+s(t/60|0,"0",2)+s(t%60,"0",2)}function te(e,t){return s(e.getUTCDate(),t,2)}function ne(e,t){return s(e.getUTCHours(),t,2)}function re(e,t){return s(e.getUTCHours()%12||12,t,2)}function ue(e,n){return s(1+t.utcDay.count(t.utcYear(e),e),n,3)}function ie(e,t){return s(e.getUTCMilliseconds(),t,3)}function ce(e,t){return ie(e,t)+"000"}function oe(e,t){return s(e.getUTCMonth()+1,t,2)}function ae(e,t){return s(e.getUTCMinutes(),t,2)}function fe(e,t){return s(e.getUTCSeconds(),t,2)}function le(e){var t=e.getUTCDay();return 0===t?7:t}function se(e,n){return s(t.utcSunday.count(t.utcYear(e)-1,e),n,2)}function ge(e){var n=e.getUTCDay();return n>=4||0===n?t.utcThursday(e):t.utcThursday.ceil(e)}function ye(e,n){return e=ge(e),s(t.utcThursday.count(t.utcYear(e),e)+(4===t.utcYear(e).getUTCDay()),n,2)}function de(e){return e.getUTCDay()}function he(e,n){return s(t.utcMonday.count(t.utcYear(e)-1,e),n,2)}function me(e,t){return s(e.getUTCFullYear()%100,t,2)}function ve(e,t){return s((e=ge(e)).getUTCFullYear()%100,t,2)}function Te(e,t){return s(e.getUTCFullYear()%1e4,t,4)}function Me(e,n){var r=e.getUTCDay();return s((e=r>=4||0===r?t.utcThursday(e):t.utcThursday.ceil(e)).getUTCFullYear()%1e4,n,4)}function De(){return"+0000"}function Ce(){return"%"}function Ue(e){return+e}function xe(e){return Math.floor(+e/1e3)}function we(t){return c=i(t),e.timeFormat=c.format,e.timeParse=c.parse,e.utcFormat=c.utcFormat,e.utcParse=c.utcParse,c}we({dateTime:"%x, %X",date:"%-m/%-d/%Y",time:"%-I:%M:%S %p",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});var pe=Date.prototype.toISOString?function(e){return e.toISOString()}:e.utcFormat("%Y-%m-%dT%H:%M:%S.%LZ");var Se=+new Date("2000-01-01T00:00:00.000Z")?function(e){var t=new Date(e);return isNaN(t)?null:t}:e.utcParse("%Y-%m-%dT%H:%M:%S.%LZ");e.isoFormat=pe,e.isoParse=Se,e.timeFormatDefaultLocale=we,e.timeFormatLocale=i,Object.defineProperty(e,"__esModule",{value:!0})});

locale/fr-FR.json

 {
-  "dateTime": "%A, le %e %B %Y, %X",
+  "dateTime": "%A %e %B %Y à %X",
   "date": "%d/%m/%Y",
@@ -4,0 +4,0 @@ "time": "%H:%M:%S",

locale/ja-JP.json

 {
-  "dateTime": "%Y %b %e %a %X",
+  "dateTime": "%x %a %X",
   "date": "%Y/%m/%d",
@@ -8,4 +8,4 @@ "time": "%H:%M:%S",
   "shortDays": ["日", "月", "火", "水", "木", "金", "土"],
-  "months": ["睦月", "如月", "弥生", "卯月", "皐月", "水無月", "文月", "葉月", "長月", "神無月", "霜月", "師走"],
+  "months": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
   "shortMonths": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"]
 }

locale/nl-NL.json

 {
-  "dateTime": "%a %e %B %Y %T",
+  "dateTime": "%a %e %B %Y %X",
   "date": "%d-%m-%Y",
@@ -4,0 +4,0 @@ "time": "%H:%M:%S",

locale/zh-TW.json

@@ -7,5 +7,5 @@ {
   "days": ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
-  "shortDays": ["週日", "週一", "週二", "週三", "週四", "週五", "週六"],
+  "shortDays": ["日", "一", "二", "三", "四", "五", "六"],
   "months": ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
   "shortMonths": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"]
 }

package.json

 {
   "name": "d3-time-format",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "description": "A JavaScript time formatter and parser inspired by strftime and strptime.",
@@ -5,0 +5,0 @@ "keywords": [

README.md

@@ -112,2 +112,4 @@ # d3-time-format
 * `%f` - microseconds as a decimal number [000000, 999999].
+* `%g` - ISO 8601 week-based year without century as a decimal number [00,99].
+* `%G` - ISO 8601 week-based year with century as a decimal number.
 * `%H` - hour (24-hour clock) as a decimal number [00,23].
@@ -136,9 +138,9 @@ * `%I` - hour (12-hour clock) as a decimal number [01,12].
 
-Directives marked with an asterisk (\*) may be affected by the [locale definition](#localeFormat).
+Directives marked with an asterisk (\*) may be affected by the [locale definition](#locales).
 
 For `%U`, all days in a new year preceding the first Sunday are considered to be in week 0. For `%W`, all days in a new year preceding the first Monday are considered to be in week 0. Week numbers are computed using [*interval*.count](https://github.com/d3/d3-time/blob/master/README.md#interval_count). For example, 2015-52 and 2016-00 represent Monday, December 28, 2015, while 2015-53 and 2016-01 represent Monday, January 4, 2016. This differs from the [ISO week date](https://en.wikipedia.org/wiki/ISO_week_date) specification (`%V`), which uses a more complicated definition!
 
-For `%V`, per the [strftime man page](http://man7.org/linux/man-pages/man3/strftime.3.html):
+For `%V`,`%g` and `%G`, per the [strftime man page](http://man7.org/linux/man-pages/man3/strftime.3.html):
 
-> In this system, weeks start on a Monday, and are numbered from 01, for the first week, up to 52 or 53, for the last week.  Week 1 is the first week where four or more days fall within the new year (or, synonymously, week 01 is: the first week of the year that contains a Thursday; or, the week that has 4 January in it).
+> In this system, weeks start on a Monday, and are numbered from 01, for the first week, up to 52 or 53, for the last week.  Week 1 is the first week where four or more days fall within the new year (or, synonymously, week 01 is: the first week of the year that contains a Thursday; or, the week that has 4 January in it). If the ISO week number belongs to the previous or next year, that year is used instead.
 
@@ -145,0 +147,0 @@ The `%` sign indicating a directive may be immediately followed by a padding modifier:

src/locale.js

@@ -66,2 +66,4 @@ import {
     "f": formatMicroseconds,
+    "g": formatYearISO,
+    "G": formatFullYearISO,
     "H": formatHour24,
@@ -100,2 +102,4 @@ "I": formatHour12,
     "f": formatUTCMicroseconds,
+    "g": formatUTCYearISO,
+    "G": formatUTCFullYearISO,
     "H": formatUTCHour24,
@@ -134,2 +138,4 @@ "I": formatUTCHour12,
     "f": parseMicroseconds,
+    "g": parseYear,
+    "G": parseFullYear,
     "H": parseHour24,
@@ -556,5 +562,9 @@ "I": parseHour24,
 
+function dISO(d) {
+  var day = d.getDay();
+  return (day >= 4 || day === 0) ? timeThursday(d) : timeThursday.ceil(d);
+}
+
 function formatWeekNumberISO(d, p) {
-  var day = d.getDay();
-  d = (day >= 4 || day === 0) ? timeThursday(d) : timeThursday.ceil(d);
+  d = dISO(d);
   return pad(timeThursday.count(timeYear(d), d) + (timeYear(d).getDay() === 4), p, 2);
@@ -575,2 +585,7 @@ }
 
+function formatYearISO(d, p) {
+  d = dISO(d);
+  return pad(d.getFullYear() % 100, p, 2);
+}
+
 function formatFullYear(d, p) {
@@ -580,2 +595,8 @@ return pad(d.getFullYear() % 10000, p, 4);
 
+function formatFullYearISO(d, p) {
+  var day = d.getDay();
+  d = (day >= 4 || day === 0) ? timeThursday(d) : timeThursday.ceil(d);
+  return pad(d.getFullYear() % 10000, p, 4);
+}
+
 function formatZone(d) {
@@ -633,5 +654,9 @@ var z = d.getTimezoneOffset();
 
+function UTCdISO(d) {
+  var day = d.getUTCDay();
+  return (day >= 4 || day === 0) ? utcThursday(d) : utcThursday.ceil(d);
+}
+
 function formatUTCWeekNumberISO(d, p) {
-  var day = d.getUTCDay();
-  d = (day >= 4 || day === 0) ? utcThursday(d) : utcThursday.ceil(d);
+  d = UTCdISO(d);
   return pad(utcThursday.count(utcYear(d), d) + (utcYear(d).getUTCDay() === 4), p, 2);
@@ -652,2 +677,7 @@ }
 
+function formatUTCYearISO(d, p) {
+  d = UTCdISO(d);
+  return pad(d.getUTCFullYear() % 100, p, 2);
+}
+
 function formatUTCFullYear(d, p) {
@@ -657,2 +687,8 @@ return pad(d.getUTCFullYear() % 10000, p, 4);
 
+function formatUTCFullYearISO(d, p) {
+  var day = d.getUTCDay();
+  d = (day >= 4 || day === 0) ? utcThursday(d) : utcThursday.ceil(d);
+  return pad(d.getUTCFullYear() % 10000, p, 4);
+}
+
 function formatUTCZone() {
@@ -659,0 +695,0 @@ return "+0000";

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

84274

increased by2.76%

Lines of code

1600

increased by3.96%

Number of lines in readme file

200

increased by1.01%

No dependency changes