Comparing version 0.1.0-stone-5 to 0.1.0-stone-6
@@ -5,52 +5,2 @@ 'use strict'; | ||
var modeDateHelper = function (date, mode) { | ||
var numberDate = 0; | ||
var jsonDate = new Date(date).toJSON().split(/T|\./); | ||
if (mode === 'date') { | ||
numberDate = Number(jsonDate[0].replaceAll('-', '')); | ||
} | ||
else if (mode === 'time') { | ||
numberDate = Number(jsonDate[1].replaceAll(':', '')); | ||
} | ||
else { | ||
numberDate = new Date(date).valueOf(); | ||
} | ||
return numberDate; | ||
}; | ||
var isBefore = function (isDate, beforeDate, modeDate) { | ||
if (modeDate === void 0) { modeDate = 'dateTime'; } | ||
var startNum = modeDateHelper(isDate, modeDate); | ||
var endNum = modeDateHelper(beforeDate, modeDate); | ||
var resultDate = false; | ||
if (startNum < endNum) { | ||
resultDate = true; | ||
} | ||
return resultDate; | ||
}; | ||
var daysInBetween = function (startDate, endDate, modeDate) { | ||
if (modeDate === void 0) { modeDate = 'dateTime'; } | ||
var startNum = modeDateHelper(startDate, modeDate); | ||
var endNum = modeDateHelper(endDate, modeDate); | ||
var timeDifference = Number(endNum) - Number(startNum); | ||
return Math.floor(timeDifference / (1000 * 60 * 60 * 24)); | ||
}; | ||
var doubleFormat = function (arg) { | ||
var newStr = String(arg); | ||
if (newStr.length === 1) { | ||
newStr = '0' + newStr; | ||
} | ||
return newStr; | ||
}; | ||
var hoursInBetween = function (startDateArg, endDateArg) { | ||
var startDate = new Date(startDateArg); | ||
var endDate = new Date(endDateArg); | ||
var milliseconds = Math.abs(Number(startDate.getTime()) - Number(endDate.getTime())); | ||
var newHours = milliseconds / 36e5; | ||
return Number(newHours.toFixed(0)); | ||
}; | ||
var relative = function (dateValue, timeZone, locale, options, defaultValue) { | ||
@@ -60,3 +10,2 @@ if (timeZone === void 0) { timeZone = 'utc'; } | ||
if (options === void 0) { options = {}; } | ||
if (defaultValue === void 0) { defaultValue = 'new'; } | ||
var nowDate = new Date(); | ||
@@ -67,51 +16,49 @@ var valDate = new Date(dateValue); | ||
} | ||
var newTimeRelative = "".concat(defaultValue); | ||
var compareDate = daysInBetween(valDate, nowDate); | ||
if (Number(compareDate) <= 365) { | ||
if (Number(compareDate) <= 28) { | ||
if (Number(compareDate) === 0) { | ||
if (Number(nowDate.getHours()) === Number(valDate.getHours())) { | ||
if (Number(nowDate.getMinutes()) === Number(valDate.getMinutes())) { | ||
var subSecondVal = Number(valDate.getSeconds()) - Number(nowDate.getSeconds()); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subSecondVal, 'second'); | ||
} | ||
else { | ||
var subMinuteVal = Number(valDate.getMinutes()) - Number(nowDate.getMinutes()); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subMinuteVal, 'minute'); | ||
} | ||
} | ||
else { | ||
var subHourVal = void 0; | ||
if (isBefore(valDate, nowDate)) { | ||
subHourVal = Number('-' + hoursInBetween(valDate, nowDate)); | ||
} | ||
else { | ||
subHourVal = Number(valDate.getHours()) - Number(nowDate.getHours()); | ||
} | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subHourVal, 'hour'); | ||
} | ||
var seconds = Math.round((valDate.valueOf() - nowDate.valueOf()) / 1000); | ||
var newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(Math.round(seconds), 'second'); | ||
var interval = seconds / 31536000; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'year'); | ||
} | ||
else { | ||
interval = seconds / 2592000; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'month'); | ||
} | ||
else { | ||
interval = seconds / 86400; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'day'); | ||
} | ||
else { | ||
if (isBefore(valDate, nowDate)) { | ||
compareDate = Number('-' + daysInBetween(valDate, nowDate)); | ||
interval = seconds / 3600; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'hour'); | ||
} | ||
else { | ||
compareDate = daysInBetween(valDate, nowDate); | ||
interval = seconds / 60; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'minute'); | ||
} | ||
} | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(compareDate, 'day'); | ||
} | ||
} | ||
else { | ||
var subMonthVal = Number("".concat(valDate.getFullYear()).concat(doubleFormat(valDate.getMonth()))) - Number("".concat(nowDate.getFullYear()).concat(doubleFormat(nowDate.getMonth()))); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subMonthVal, 'month'); | ||
} | ||
} | ||
else { | ||
var subYearVal = Number(valDate.getFullYear()) - Number(nowDate.getFullYear()); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subYearVal, 'year'); | ||
} | ||
return newTimeRelative; | ||
}; | ||
var hoursInBetween = function (startDateArg, endDateArg) { | ||
var startDate = new Date(startDateArg); | ||
var endDate = new Date(endDateArg); | ||
var milliseconds = Math.abs(Number(startDate.getTime()) - Number(endDate.getTime())); | ||
var newHours = milliseconds / 36e5; | ||
return Number(newHours.toFixed(0)); | ||
}; | ||
exports.hoursInBetween = hoursInBetween; | ||
exports.relative = relative; |
@@ -1,51 +0,1 @@ | ||
var modeDateHelper = function (date, mode) { | ||
var numberDate = 0; | ||
var jsonDate = new Date(date).toJSON().split(/T|\./); | ||
if (mode === 'date') { | ||
numberDate = Number(jsonDate[0].replaceAll('-', '')); | ||
} | ||
else if (mode === 'time') { | ||
numberDate = Number(jsonDate[1].replaceAll(':', '')); | ||
} | ||
else { | ||
numberDate = new Date(date).valueOf(); | ||
} | ||
return numberDate; | ||
}; | ||
var isBefore = function (isDate, beforeDate, modeDate) { | ||
if (modeDate === void 0) { modeDate = 'dateTime'; } | ||
var startNum = modeDateHelper(isDate, modeDate); | ||
var endNum = modeDateHelper(beforeDate, modeDate); | ||
var resultDate = false; | ||
if (startNum < endNum) { | ||
resultDate = true; | ||
} | ||
return resultDate; | ||
}; | ||
var daysInBetween = function (startDate, endDate, modeDate) { | ||
if (modeDate === void 0) { modeDate = 'dateTime'; } | ||
var startNum = modeDateHelper(startDate, modeDate); | ||
var endNum = modeDateHelper(endDate, modeDate); | ||
var timeDifference = Number(endNum) - Number(startNum); | ||
return Math.floor(timeDifference / (1000 * 60 * 60 * 24)); | ||
}; | ||
var doubleFormat = function (arg) { | ||
var newStr = String(arg); | ||
if (newStr.length === 1) { | ||
newStr = '0' + newStr; | ||
} | ||
return newStr; | ||
}; | ||
var hoursInBetween = function (startDateArg, endDateArg) { | ||
var startDate = new Date(startDateArg); | ||
var endDate = new Date(endDateArg); | ||
var milliseconds = Math.abs(Number(startDate.getTime()) - Number(endDate.getTime())); | ||
var newHours = milliseconds / 36e5; | ||
return Number(newHours.toFixed(0)); | ||
}; | ||
var relative = function (dateValue, timeZone, locale, options, defaultValue) { | ||
@@ -55,3 +5,2 @@ if (timeZone === void 0) { timeZone = 'utc'; } | ||
if (options === void 0) { options = {}; } | ||
if (defaultValue === void 0) { defaultValue = 'new'; } | ||
var nowDate = new Date(); | ||
@@ -62,50 +11,48 @@ var valDate = new Date(dateValue); | ||
} | ||
var newTimeRelative = "".concat(defaultValue); | ||
var compareDate = daysInBetween(valDate, nowDate); | ||
if (Number(compareDate) <= 365) { | ||
if (Number(compareDate) <= 28) { | ||
if (Number(compareDate) === 0) { | ||
if (Number(nowDate.getHours()) === Number(valDate.getHours())) { | ||
if (Number(nowDate.getMinutes()) === Number(valDate.getMinutes())) { | ||
var subSecondVal = Number(valDate.getSeconds()) - Number(nowDate.getSeconds()); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subSecondVal, 'second'); | ||
} | ||
else { | ||
var subMinuteVal = Number(valDate.getMinutes()) - Number(nowDate.getMinutes()); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subMinuteVal, 'minute'); | ||
} | ||
} | ||
else { | ||
var subHourVal = void 0; | ||
if (isBefore(valDate, nowDate)) { | ||
subHourVal = Number('-' + hoursInBetween(valDate, nowDate)); | ||
} | ||
else { | ||
subHourVal = Number(valDate.getHours()) - Number(nowDate.getHours()); | ||
} | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subHourVal, 'hour'); | ||
} | ||
var seconds = Math.round((valDate.valueOf() - nowDate.valueOf()) / 1000); | ||
var newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(Math.round(seconds), 'second'); | ||
var interval = seconds / 31536000; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'year'); | ||
} | ||
else { | ||
interval = seconds / 2592000; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'month'); | ||
} | ||
else { | ||
interval = seconds / 86400; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'day'); | ||
} | ||
else { | ||
if (isBefore(valDate, nowDate)) { | ||
compareDate = Number('-' + daysInBetween(valDate, nowDate)); | ||
interval = seconds / 3600; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'hour'); | ||
} | ||
else { | ||
compareDate = daysInBetween(valDate, nowDate); | ||
interval = seconds / 60; | ||
if (Math.abs(interval) > 1) { | ||
var newInterval = Math.round(interval); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'minute'); | ||
} | ||
} | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(compareDate, 'day'); | ||
} | ||
} | ||
else { | ||
var subMonthVal = Number("".concat(valDate.getFullYear()).concat(doubleFormat(valDate.getMonth()))) - Number("".concat(nowDate.getFullYear()).concat(doubleFormat(nowDate.getMonth()))); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subMonthVal, 'month'); | ||
} | ||
} | ||
else { | ||
var subYearVal = Number(valDate.getFullYear()) - Number(nowDate.getFullYear()); | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subYearVal, 'year'); | ||
} | ||
return newTimeRelative; | ||
}; | ||
var hoursInBetween = function (startDateArg, endDateArg) { | ||
var startDate = new Date(startDateArg); | ||
var endDate = new Date(endDateArg); | ||
var milliseconds = Math.abs(Number(startDate.getTime()) - Number(endDate.getTime())); | ||
var newHours = milliseconds / 36e5; | ||
return Number(newHours.toFixed(0)); | ||
}; | ||
export { hoursInBetween, relative }; |
@@ -1,1 +0,1 @@ | ||
var time=function(e){"use strict";var t=function(e,t){var r=new Date(e).toJSON().split(/T|\./);return"date"===t?Number(r[0].replaceAll("-","")):"time"===t?Number(r[1].replaceAll(":","")):new Date(e).valueOf()},r=function(e,r,n){void 0===n&&(n="dateTime");var a=!1;return t(e,n)<t(r,n)&&(a=!0),a},n=function(e,r,n){void 0===n&&(n="dateTime");var a=t(e,n),u=t(r,n),m=Number(u)-Number(a);return Math.floor(m/864e5)},a=function(e){var t=String(e);return 1===t.length&&(t="0"+t),t},u=function(e,t){var r=new Date(e),n=new Date(t),a=Math.abs(Number(r.getTime())-Number(n.getTime()));return Number((a/36e5).toFixed(0))};return e.hoursInBetween=u,e.relative=function(e,t,m,o,i){void 0===t&&(t="utc"),void 0===m&&(m="en-US"),void 0===o&&(o={}),void 0===i&&(i="new");var l=new Date,v=new Date(e);"utc"!==t&&(v=new Date(new Date(e).toJSON()));var b="".concat(i),N=n(v,l);if(Number(N)<=365)if(Number(N)<=28)if(0===Number(N))if(Number(l.getHours())===Number(v.getHours()))if(Number(l.getMinutes())===Number(v.getMinutes())){var c=Number(v.getSeconds())-Number(l.getSeconds());b=new Intl.RelativeTimeFormat(m,o).format(c,"second")}else{var s=Number(v.getMinutes())-Number(l.getMinutes());b=new Intl.RelativeTimeFormat(m,o).format(s,"minute")}else{var f=void 0;f=r(v,l)?Number("-"+u(v,l)):Number(v.getHours())-Number(l.getHours()),b=new Intl.RelativeTimeFormat(m,o).format(f,"hour")}else N=r(v,l)?Number("-"+n(v,l)):n(v,l),b=new Intl.RelativeTimeFormat(m,o).format(N,"day");else{var g=Number("".concat(v.getFullYear()).concat(a(v.getMonth())))-Number("".concat(l.getFullYear()).concat(a(l.getMonth())));b=new Intl.RelativeTimeFormat(m,o).format(g,"month")}else{var d=Number(v.getFullYear())-Number(l.getFullYear());b=new Intl.RelativeTimeFormat(m,o).format(d,"year")}return b},Object.defineProperty(e,"__esModule",{value:!0}),e}({}); | ||
var time=function(e){"use strict";return e.hoursInBetween=function(e,t){var a=new Date(e),n=new Date(t),r=Math.abs(Number(a.getTime())-Number(n.getTime()));return Number((r/36e5).toFixed(0))},e.relative=function(e,t,a,n,r){void 0===t&&(t="utc"),void 0===a&&(a="en-US"),void 0===n&&(n={});var o=new Date,i=new Date(e);"utc"!==t&&(i=new Date(new Date(e).toJSON()));var m=Math.round((i.valueOf()-o.valueOf())/1e3),u=new Intl.RelativeTimeFormat(a,n).format(Math.round(m),"second"),l=m/31536e3;if(Math.abs(l)>1){var v=Math.round(l);u=new Intl.RelativeTimeFormat(a,n).format(v,"year")}else if(l=m/2592e3,Math.abs(l)>1){v=Math.round(l);u=new Intl.RelativeTimeFormat(a,n).format(v,"month")}else if(l=m/86400,Math.abs(l)>1){v=Math.round(l);u=new Intl.RelativeTimeFormat(a,n).format(v,"day")}else if(l=m/3600,Math.abs(l)>1){v=Math.round(l);u=new Intl.RelativeTimeFormat(a,n).format(v,"hour")}else if(l=m/60,Math.abs(l)>1){v=Math.round(l);u=new Intl.RelativeTimeFormat(a,n).format(v,"minute")}return u},Object.defineProperty(e,"__esModule",{value:!0}),e}({}); |
{ | ||
"name": "alga-js", | ||
"version": "0.1.0-stone-5", | ||
"version": "0.1.0-stone-6", | ||
"description": "Alga.js is a JavaScript helper to help build UI components by using any of modern web frameworks or libraries", | ||
@@ -5,0 +5,0 @@ "module": "./dist/alga.min.js", |
@@ -13,39 +13,33 @@ import { isBefore } from '../date/isDate' | ||
let newTimeRelative = `${defaultValue}` | ||
let compareDate = daysInBetween(valDate, nowDate) | ||
if(Number(compareDate) <= 365) { | ||
if(Number(compareDate) <= 28) { | ||
if(Number(compareDate) === 0) { | ||
if(Number(nowDate.getHours()) === Number(valDate.getHours())) { | ||
if(Number(nowDate.getMinutes()) === Number(valDate.getMinutes())) { | ||
const subSecondVal = Number(valDate.getSeconds()) - Number(nowDate.getSeconds()) | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subSecondVal, 'second') | ||
} else { | ||
const subMinuteVal = Number(valDate.getMinutes()) - Number(nowDate.getMinutes()) | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subMinuteVal, 'minute') | ||
} | ||
let seconds = Math.round((valDate.valueOf() - nowDate.valueOf()) / 1000) | ||
let newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(Math.round(seconds), 'second') | ||
let interval = seconds / 31536000 | ||
if (Math.abs(interval) > 1) { | ||
const newInterval = Math.round(interval) | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'year') | ||
} else { | ||
interval = seconds / 2592000 | ||
if (Math.abs(interval) > 1) { | ||
const newInterval = Math.round(interval) | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'month') | ||
} else { | ||
interval = seconds / 86400; | ||
if (Math.abs(interval) > 1) { | ||
const newInterval = Math.round(interval) | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'day') | ||
} else { | ||
interval = seconds / 3600; | ||
if (Math.abs(interval) > 1) { | ||
const newInterval = Math.round(interval) | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'hour') | ||
} else { | ||
let subHourVal; | ||
if(isBefore(valDate, nowDate)) { | ||
subHourVal = Number('-'+hoursInBetween(valDate, nowDate)) | ||
} else { | ||
subHourVal = Number(valDate.getHours()) - Number(nowDate.getHours()) | ||
interval = seconds / 60; | ||
if (Math.abs(interval) > 1) { | ||
const newInterval = Math.round(interval) | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(newInterval, 'minute') | ||
} | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subHourVal, 'hour') | ||
} | ||
} else { | ||
if(isBefore(valDate, nowDate)) { | ||
compareDate = Number('-' + daysInBetween(valDate, nowDate)) | ||
} else { | ||
compareDate = daysInBetween(valDate, nowDate) | ||
} | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(compareDate, 'day') | ||
} | ||
} else { | ||
const subMonthVal = Number(`${valDate.getFullYear()}${doubleFormat(valDate.getMonth())}`) - Number(`${nowDate.getFullYear()}${doubleFormat(nowDate.getMonth())}`) | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subMonthVal, 'month') | ||
} | ||
} else { | ||
const subYearVal = Number(valDate.getFullYear()) - Number(nowDate.getFullYear()) | ||
newTimeRelative = new Intl.RelativeTimeFormat(locale, options).format(subYearVal, 'year') | ||
} | ||
@@ -52,0 +46,0 @@ |
168
261551
3476