pascua - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

dist/index.js

@@ -15,2 +15,27 @@ "use strict";
 /**
+ * Valida si el año pasado como argumento es un número entero mayor a 1983. En 1983 se expide la ley
+ * por la cual se corren algunos festivos al próximo lunes:
+ * http://www.alcaldiabogota.gov.co/sisjur/normas/Norma1.jsp?i=4954
+ * @param {number} year El año para el cual se desea obtener los días festivos. Mayor a 1983.
+ */
+function validateYear(year) {
+  var int = Number.parseInt(year, 10);
+  if (!Number.isNaN(int) && int > 1983) {
+    return int;
+  }
+  throw new Error("Invalid year. Should be an integer > 1983");
+}
+
+/**
+ * Devuelve verdadero si el argumento pasado corresponde a un objeto de tipo fecha de JavaScript y
+ * si el año de esa fecha es mayor a 1983, que es el año en el que se establece el decreto que rige
+ * los festivos actuales:
+ * http://www.alcaldiabogota.gov.co/sisjur/normas/Norma1.jsp?i=4954
+ * @param {any} date La fecha que se desea validar.
+ */
+function isValidDate(date) {
+  return Object.prototype.toString.call(date) === "[object Date]" && validateYear(date.getFullYear());
+}
+
+/**
  * Devuelve una cadena de texto en formato ISO 8601 que representa la fecha local correspondiente a
@@ -162,5 +187,9 @@ * la fecha almacenada en el objeto Date pasado como argumento. El formato devuelto es el siguiente:
  */
-function getHoliday(date) {
+function getHoliday() {
+  var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
   var timeOffset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "-05:00";
 
+  if (!isValidDate(date)) {
+    throw new Error("Invalid date.");
+  }
   var year = date.getFullYear();
@@ -218,3 +247,6 @@ for (var i = 0; i < _holidays2.default.length; i += 1) {
  */
-function getAllHolidays(year) {
+function getAllHolidays() {
+  var year = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date().getFullYear();
+
+  var validYear = validateYear(year);
   var yearHolidays = [];
@@ -224,9 +256,9 @@ for (var i = 0; i < _holidays2.default.length; i += 1) {
     if (_holidays2.default[i].type === 1) {
-      holidayDate = getISODate(year, _holidays2.default[i].month, _holidays2.default[i].day);
+      holidayDate = getISODate(validYear, _holidays2.default[i].month, _holidays2.default[i].day);
     }
     if (_holidays2.default[i].type === 2) {
-      holidayDate = getNextDayOfWeek(getISODate(year, _holidays2.default[i].month, _holidays2.default[i].day), 1);
+      holidayDate = getNextDayOfWeek(getISODate(validYear, _holidays2.default[i].month, _holidays2.default[i].day), 1);
     }
     if (_holidays2.default[i].type === 3) {
-      holidayDate = addDays(getPascua(year), _holidays2.default[i].offset);
+      holidayDate = addDays(getPascua(validYear), _holidays2.default[i].offset);
     }
@@ -233,0 +265,0 @@ yearHolidays.push({

dist/index.test.js

@@ -11,3 +11,3 @@ "use strict";
 describe("get the name of a given holiday date", function () {
-  var holidayCases = [{ date: "2017-04-12", name: "" }, { date: "2017-04-13", name: "Jueves Santo" }, { date: "2014-04-18", name: "Viernes Santo" }, { date: "2017-05-29", name: "Ascensión de Jesús" }, { date: "2010-05-17", name: "Ascensión de Jesús" }, { date: "2011-06-27", name: "Corpus Christi" }, { date: "2016-06-06", name: "Sagrado Corazón de Jesús" }, { date: "2017-04-15", name: "" }, { date: "1937-01-01", name: "Año Nuevo" }, { date: "1927-12-31", name: "" }, { date: "2013-01-07", name: "Reyes Magos" }, { date: "2018-01-08", name: "Reyes Magos" }, { date: "2025-12-25", name: "Navidad" }, { date: "1927-12-24", name: "" }, { date: "2017-03-13", name: "" }, { date: "2017-01-09", name: "Reyes Magos" }, { date: "2014-01-06", name: "Reyes Magos" }, { date: "2011-08-15", name: "Asunción de la Virgen" }, { date: "2013-11-11", name: "Independencia de Cartagena" }, { date: "2018-11-05", name: "Todos los Santos" }, { date: "2013-10-14", name: "Día de la Raza" }, { date: "2015-10-12", name: "Día de la Raza" }, { date: "2010-10-18", name: "Día de la Raza" }];
+  var holidayCases = [{ date: "2017-04-12", name: "" }, { date: "2017-04-13", name: "Jueves Santo" }, { date: "2014-04-18", name: "Viernes Santo" }, { date: "2017-05-29", name: "Ascensión de Jesús" }, { date: "2010-05-17", name: "Ascensión de Jesús" }, { date: "2011-06-27", name: "Corpus Christi" }, { date: "2016-06-06", name: "Sagrado Corazón de Jesús" }, { date: "2017-04-15", name: "" }, { date: "1986-01-01", name: "Año Nuevo" }, { date: "1984-12-31", name: "" }, { date: "2013-01-07", name: "Reyes Magos" }, { date: "2018-01-08", name: "Reyes Magos" }, { date: "2025-12-25", name: "Navidad" }, { date: "1987-12-24", name: "" }, { date: "2017-03-13", name: "" }, { date: "2017-01-09", name: "Reyes Magos" }, { date: "2014-01-06", name: "Reyes Magos" }, { date: "2011-08-15", name: "Asunción de la Virgen" }, { date: "2013-11-11", name: "Independencia de Cartagena" }, { date: "2018-11-05", name: "Todos los Santos" }, { date: "2013-10-14", name: "Día de la Raza" }, { date: "2015-10-12", name: "Día de la Raza" }, { date: "2010-10-18", name: "Día de la Raza" }];
   holidayCases.forEach(function (holiday) {
@@ -20,2 +20,6 @@ it("should return '" + holiday.name + "' for " + holiday.date, function () {
     });
+    it("should return the info for the current day when no date given", function () {
+      var currDate = new Date();
+      expect((0, _index.getHoliday)()).toBe((0, _index.getHoliday)(currDate));
+    });
   });
@@ -40,2 +44,35 @@ });
   });
+  it("Should return holidays for the current year when no year given", function () {
+    var currYear = new Date().getFullYear();
+    var currHols = (0, _index.getAllHolidays)();
+    expect(currHols).toEqual((0, _index.getAllHolidays)(currYear));
+    expect(Array.isArray(currHols)).toBe(true);
+    expect(currHols.length).toBe(18);
+  });
+});
+
+describe("Should return error for a non valid year", function () {
+  it("should return error for a non integer number <= 1983", function () {
+    expect(function () {
+      (0, _index.getAllHolidays)(1983);
+    }).toThrow("Invalid year. Should be an integer > 1983");
+    expect(function () {
+      (0, _index.getAllHolidays)(19);
+    }).toThrow("Invalid year. Should be an integer > 1983");
+    expect(function () {
+      (0, _index.getAllHolidays)("");
+    }).toThrow("Invalid year. Should be an integer > 1983");
+    expect(function () {
+      (0, _index.getAllHolidays)([]);
+    }).toThrow("Invalid year. Should be an integer > 1983");
+    expect(function () {
+      (0, _index.getAllHolidays)("asdf");
+    }).toThrow("Invalid year. Should be an integer > 1983");
+    expect(function () {
+      (0, _index.getHoliday)(new Date("1983-12-31"));
+    }).toThrow("Invalid year. Should be an integer > 1983");
+    expect(function () {
+      (0, _index.getHoliday)("1983-12-31");
+    }).toThrow("Invalid date.");
+  });
 });

dist/pascua.umd.js

@@ -117,2 +117,27 @@ (function webpackUniversalModuleDefinition(root, factory) {
 /**
+ * Valida si el año pasado como argumento es un número entero mayor a 1983. En 1983 se expide la ley
+ * por la cual se corren algunos festivos al próximo lunes:
+ * http://www.alcaldiabogota.gov.co/sisjur/normas/Norma1.jsp?i=4954
+ * @param {number} year El año para el cual se desea obtener los días festivos. Mayor a 1983.
+ */
+function validateYear(year) {
+  var int = Number.parseInt(year, 10);
+  if (!Number.isNaN(int) && int > 1983) {
+    return int;
+  }
+  throw new Error("Invalid year. Should be an integer > 1983");
+}
+
+/**
+ * Devuelve verdadero si el argumento pasado corresponde a un objeto de tipo fecha de JavaScript y
+ * si el año de esa fecha es mayor a 1983, que es el año en el que se establece el decreto que rige
+ * los festivos actuales:
+ * http://www.alcaldiabogota.gov.co/sisjur/normas/Norma1.jsp?i=4954
+ * @param {any} date La fecha que se desea validar.
+ */
+function isValidDate(date) {
+  return Object.prototype.toString.call(date) === "[object Date]" && validateYear(date.getFullYear());
+}
+
+/**
  * Devuelve una cadena de texto en formato ISO 8601 que representa la fecha local correspondiente a
@@ -264,5 +289,9 @@ * la fecha almacenada en el objeto Date pasado como argumento. El formato devuelto es el siguiente:
  */
-function getHoliday(date) {
+function getHoliday() {
+  var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date();
   var timeOffset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "-05:00";
 
+  if (!isValidDate(date)) {
+    throw new Error("Invalid date.");
+  }
   var year = date.getFullYear();
@@ -320,3 +349,6 @@ for (var i = 0; i < _holidays2.default.length; i += 1) {
  */
-function getAllHolidays(year) {
+function getAllHolidays() {
+  var year = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : new Date().getFullYear();
+
+  var validYear = validateYear(year);
   var yearHolidays = [];
@@ -326,9 +358,9 @@ for (var i = 0; i < _holidays2.default.length; i += 1) {
     if (_holidays2.default[i].type === 1) {
-      holidayDate = getISODate(year, _holidays2.default[i].month, _holidays2.default[i].day);
+      holidayDate = getISODate(validYear, _holidays2.default[i].month, _holidays2.default[i].day);
     }
     if (_holidays2.default[i].type === 2) {
-      holidayDate = getNextDayOfWeek(getISODate(year, _holidays2.default[i].month, _holidays2.default[i].day), 1);
+      holidayDate = getNextDayOfWeek(getISODate(validYear, _holidays2.default[i].month, _holidays2.default[i].day), 1);
     }
     if (_holidays2.default[i].type === 3) {
-      holidayDate = addDays(getPascua(year), _holidays2.default[i].offset);
+      holidayDate = addDays(getPascua(validYear), _holidays2.default[i].offset);
     }
@@ -335,0 +367,0 @@ yearHolidays.push({

dist/pascua.umd.min.js

@@ -1,2 +0,2 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.pascua=t():e.pascua=t()}(window,function(){return function(e){var t={};function a(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,a),o.l=!0,o.exports}return a.m=e,a.c=t,a.d=function(e,t,n){a.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},a.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="",a(a.s=1)}([function(e){e.exports=[{type:1,name:"Año Nuevo",day:1,month:1},{type:1,name:"Día del Trabajo",day:1,month:5},{type:1,name:"Grito de la Independencia",day:20,month:7},{type:1,name:"Batalla de Boyacá",day:7,month:8},{type:1,name:"Inmaculada Concepción",day:8,month:12},{type:1,name:"Navidad",day:25,month:12},{type:2,name:"Reyes Magos",day:6,month:1},{type:2,name:"San José",day:19,month:3},{type:2,name:"San Pedro y San Pablo",day:29,month:6},{type:2,name:"Asunción de la Virgen",day:15,month:8},{type:2,name:"Día de la Raza",day:12,month:10},{type:2,name:"Todos los Santos",day:1,month:11},{type:2,name:"Independencia de Cartagena",day:11,month:11},{type:3,name:"Jueves Santo",offset:-3},{type:3,name:"Viernes Santo",offset:-2},{type:3,name:"Ascensión de Jesús",offset:43},{type:3,name:"Corpus Christi",offset:64},{type:3,name:"Sagrado Corazón de Jesús",offset:71}]},function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getAllHolidays=t.getHoliday=void 0;var n,o=a(0),r=(n=o)&&n.__esModule?n:{default:n};function d(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"-05:00",a=e.getFullYear(),n=e.getMonth()+1,o=e.getDate();return a+"-"+(n<10?"0"+n:n)+"-"+(o<10?"0"+o:o)+"T00:00:00.000"+t}function u(e,t,a){var n=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"-05:00";return new Date(e+"-"+(t<10?"0"+t:t)+"-"+(a<10?"0"+a:a)+"T00:00:00.000"+n)}function f(e,t){var a=new Date(e.getTime());return a.setDate(a.getDate()+t),a}function l(e,t){return e.getDate()===t.getDate()&&e.getMonth()===t.getMonth()}function y(e,t){var a=new Date(e.getTime());return a.setDate(e.getDate()+(7+t-e.getDay())%7),a}function i(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"-05:00",a=e%19,n=Math.floor(e/100),o=e%100,r=Math.floor(n/4),d=n%4,f=Math.floor((n+8)/25),l=(19*a+n-r-Math.floor((n-f+1)/3)+15)%30,y=(32+2*d+2*Math.floor(o/4)-l-o%4)%7,i=l+y-7*Math.floor((a+11*l+22*y)/451)+114;return u(e,Math.floor(i/31),1+i%31,t)}t.getHoliday=function(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"-05:00",a=e.getFullYear(),n=0;n<r.default.length;n+=1){if(1===r.default[n].type&&l(e,u(a,r.default[n].month,r.default[n].day,t)))return r.default[n].name;if(2===r.default[n].type&&l(e,y(u(a,r.default[n].month,r.default[n].day,t),1)))return r.default[n].name;if(3===r.default[n].type&&l(e,f(i(a,t),r.default[n].offset)))return r.default[n].name}return""},t.getAllHolidays=function(e){for(var t=[],a=0;a<r.default.length;a+=1){var n=void 0;1===r.default[a].type&&(n=u(e,r.default[a].month,r.default[a].day)),2===r.default[a].type&&(n=y(u(e,r.default[a].month,r.default[a].day),1)),3===r.default[a].type&&(n=f(i(e),r.default[a].offset)),t.push({date:d(n),type:r.default[a].type,name:r.default[a].name})}return t}}])});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.pascua=t():e.pascua=t()}(window,function(){return function(e){var t={};function n(a){if(t[a])return t[a].exports;var o=t[a]={i:a,l:!1,exports:{}};return e[a].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,a){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:a})},n.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=1)}([function(e){e.exports=[{type:1,name:"Año Nuevo",day:1,month:1},{type:1,name:"Día del Trabajo",day:1,month:5},{type:1,name:"Grito de la Independencia",day:20,month:7},{type:1,name:"Batalla de Boyacá",day:7,month:8},{type:1,name:"Inmaculada Concepción",day:8,month:12},{type:1,name:"Navidad",day:25,month:12},{type:2,name:"Reyes Magos",day:6,month:1},{type:2,name:"San José",day:19,month:3},{type:2,name:"San Pedro y San Pablo",day:29,month:6},{type:2,name:"Asunción de la Virgen",day:15,month:8},{type:2,name:"Día de la Raza",day:12,month:10},{type:2,name:"Todos los Santos",day:1,month:11},{type:2,name:"Independencia de Cartagena",day:11,month:11},{type:3,name:"Jueves Santo",offset:-3},{type:3,name:"Viernes Santo",offset:-2},{type:3,name:"Ascensión de Jesús",offset:43},{type:3,name:"Corpus Christi",offset:64},{type:3,name:"Sagrado Corazón de Jesús",offset:71}]},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getAllHolidays=t.getHoliday=void 0;var a,o=n(0),r=(a=o)&&a.__esModule?a:{default:a};function u(e){var t=Number.parseInt(e,10);if(!Number.isNaN(t)&&t>1983)return t;throw new Error("Invalid year. Should be an integer > 1983")}function d(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"-05:00",n=e.getFullYear(),a=e.getMonth()+1,o=e.getDate();return n+"-"+(a<10?"0"+a:a)+"-"+(o<10?"0"+o:o)+"T00:00:00.000"+t}function f(e,t,n){var a=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"-05:00";return new Date(e+"-"+(t<10?"0"+t:t)+"-"+(n<10?"0"+n:n)+"T00:00:00.000"+a)}function l(e,t){var n=new Date(e.getTime());return n.setDate(n.getDate()+t),n}function i(e,t){return e.getDate()===t.getDate()&&e.getMonth()===t.getMonth()}function y(e,t){var n=new Date(e.getTime());return n.setDate(e.getDate()+(7+t-e.getDay())%7),n}function p(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"-05:00",n=e%19,a=Math.floor(e/100),o=e%100,r=Math.floor(a/4),u=a%4,d=Math.floor((a+8)/25),l=(19*n+a-r-Math.floor((a-d+1)/3)+15)%30,i=(32+2*u+2*Math.floor(o/4)-l-o%4)%7,y=l+i-7*Math.floor((n+11*l+22*i)/451)+114;return f(e,Math.floor(y/31),1+y%31,t)}t.getHoliday=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:new Date,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"-05:00";if(!function(e){return"[object Date]"===Object.prototype.toString.call(e)&&u(e.getFullYear())}(e))throw new Error("Invalid date.");for(var n=e.getFullYear(),a=0;a<r.default.length;a+=1){if(1===r.default[a].type&&i(e,f(n,r.default[a].month,r.default[a].day,t)))return r.default[a].name;if(2===r.default[a].type&&i(e,y(f(n,r.default[a].month,r.default[a].day,t),1)))return r.default[a].name;if(3===r.default[a].type&&i(e,l(p(n,t),r.default[a].offset)))return r.default[a].name}return""},t.getAllHolidays=function(){for(var e=u(arguments.length>0&&void 0!==arguments[0]?arguments[0]:(new Date).getFullYear()),t=[],n=0;n<r.default.length;n+=1){var a=void 0;1===r.default[n].type&&(a=f(e,r.default[n].month,r.default[n].day)),2===r.default[n].type&&(a=y(f(e,r.default[n].month,r.default[n].day),1)),3===r.default[n].type&&(a=l(p(e),r.default[n].offset)),t.push({date:d(a),type:r.default[n].type,name:r.default[n].name})}return t}}])});
 //# sourceMappingURL=pascua.umd.min.js.map

package.json

 {
   "name": "pascua",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Calculadora para los festivos en Colombia",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

No alert changes

Improved metrics

Total package byte prevSize

92124

increased by9.96%

Lines of code

710

increased by15.64%

No dependency changes