@jamesrock/rockjs 1.17.0 → 1.19.0

package/index.js

@@ -1,7 +1,4 @@
-const formatMinutes = (time) => Math.floor((time % (1000 * 60 * 60)) / (1000 * 60));
-const formatSeconds = (time) => Math.floor((time % (1000 * 60)) / 1000);
-const pad = (time) => time.toString().padStart(2, '0');
-const formatter = new Intl.NumberFormat('en-GB');
+const numberFormatter = new Intl.NumberFormat('en-GB');
 const currencyFormatter = new Intl.NumberFormat('en-GB', {style: 'currency', currency: 'GBP'});
 
 export const random = (min, max) => (Math.floor(Math.random()*((max-min)+1))+min);
@@ -17,18 +14,21 @@ export const isTiny = () => !window.matchMedia('(min-width: 450px)').matches;
 export const isDarkMode = () => window.matchMedia('(prefers-color-scheme: dark)').matches;
 export const makeEven = (value) => value % 2 === 1 ? value - 1 : value;
 export const limit = (value, max) => value > max ? max : value;
-export const formatTime = (t) => `${pad(formatMinutes(t))}:${pad(formatSeconds(t))}`;
-export const formatNumber = (n) => formatter.format(n);
+export const toDouble = (a) => a.toString().padStart(2, '0');
+export const formatMinutes = (ms) => toDouble(Math.floor((ms % (1000 * 60 * 60)) / (1000 * 60)));
+export const formatSeconds = (ms) => toDouble(Math.floor((ms % (1000 * 60)) / 1000));
+export const formatTime = (ms) => `${formatMinutes(ms)}:${formatSeconds(ms)}`;
+export const formatNumber = (n) => numberFormatter.format(n);
 export const formatCurrency = (n) => currencyFormatter.format(n);
 export const formatDate = (date, type = 'short') => date.toLocaleDateString('en-GB', { dateStyle: type });
-export const getDateString = (type = 'short') => new Date().toLocaleDateString('en-GB', { dateStyle: type });
+export const getDateString = (type = 'short') => formatDate(new Date(), type);
 export const getTimeString = (type = 'short') => new Date().toLocaleTimeString('en-GB', { timeStyle: type });
 export const getDateTimeString = (type = 'short') => `${getDateString(type)} ${getTimeString(type)}`;
 export const isValidKey = (key, options) => options.includes(key);
 export const makeArray = (length, mapper = (a, i) => i) => Array.from({length}, mapper);
-export const floorTo = (number, to) => (Math.floor(number*to)/to);
-export const roundTo = (number, to) => (Math.round(number*to)/to);
-export const ceilTo = (number, to) => (Math.ceil(number*to)/to);
+export const floorTo = (number, to = 1) => (Math.floor(number*to)/to);
+export const roundTo = (number, to = 1) => (Math.round(number*to)/to);
+export const ceilTo = (number, to = 1) => (Math.ceil(number*to)/to);
 export const getXPercentOfY = (x, y) => (y*(x/100));
 export const getXAsPercentOfY = (x, y) => ((x/y)*100);
 
@@ -144,6 +144,24 @@ export const makeBitArray = (size) => {
   });
 };
 
+const makeBitMapItem = (a, size) => {
+  const ref = makeBitArray(size);
+  let leftover = a;
+  return makeArray(size, (v, i) => {
+    if(leftover >= ref[i]) {
+      leftover -= ref[i];
+      return 1;
+    }
+    else {
+      return 0;
+    };
+  });
+};
+
+export const makeBitMap = (size) => {
+  return makeArray(2**size, (a, i) => makeBitMapItem(i, size));
+};
+
 export const makeHexMap = (full = true) => {
   const out = [];
   const hexMap = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'];
@@ -522,3 +540,57 @@ export class Collection extends Array {
 
   };
 };
+
+export class Time {
+  second = 1000;
+  minute = (this.second * 60);
+  hour = (this.minute * 60);
+  day = (this.hour * 24);
+  year = (this.day * 365);
+	getSeconds(ms) {
+		return floorTo(ms / this.second);
+	};
+	getMinutes(ms) {
+		return floorTo(ms / this.minute);
+	};
+	getHours(ms) {
+		return floorTo(ms / this.hour);
+	};
+	getDays(ms) {
+		return floorTo(ms / this.day);
+	};
+	getYears(ms) {
+		return floorTo(ms / this.year);
+	};
+  getMillisecondsInHour(ms) {
+		return (ms % this.hour);
+	};
+  getMillisecondsInMinute(ms) {
+		return (ms % this.minute);
+	};
+	getMillisecondsInDay(ms) {
+		return (ms % this.day);
+	};
+  getSecondsInDay(ms) {
+		return (this.getSeconds(ms) % this.day);
+	};
+	getMinutesInDay(ms) {
+		return (this.getMinutes(ms) % this.day);
+	};
+	getHoursInDay(ms) {
+		return (this.getHours(ms) % this.day);
+	};
+	getDaysInYear(ms) {
+		return (this.getDays(ms) % this.year);
+	};
+  getMinutesInHour(ms) {
+		return floorTo(this.getMillisecondsInHour(ms) / this.minute);
+	};
+  getSecondsInMinute(ms) {
+		return floorTo(this.getMillisecondsInMinute(ms) / this.second);
+	};
+  formatSeconds = (ms) => toDouble(this.getSecondsInMinute(ms));
+  formatMinutes = (ms) => toDouble(this.getMinutesInHour(ms));
+  formatHours = (ms) => toDouble(this.getHours(ms));
+  format = (ms) => `${this.formatMinutes(ms)}:${this.formatSeconds(ms)}`;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jamesrock/rockjs",
-  "version": "1.17.0",
+  "version": "1.19.0",
   "description": "utility bliss",
   "license": "ISC",
   "author": "James Rock",