dtg-js 1.1.2 → 1.2.0

package/index.js

@@ -1,38 +1,47 @@
-// prettier-ignore
-const TABLE = Array.of(
-    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
-    'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-    'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
-    'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-    'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x'
-  );
+const TABLE = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwx";
+
+const LOOKUP = new Uint8Array(128);
+for (let i = 0; i < TABLE.length; i++) {
+  LOOKUP[TABLE.charCodeAt(i)] = i;
+}
 
 export const toJSDate = (base60) => {
-  if (!/^[0-9A-Za-x]{7}$/.test(base60)) {
-    throw new Error("It\'s not a valid base 60 string");
+  if (base60.length !== 7) {
+    throw new Error("Invalid base60 length");
   }
 
-  const mem = base60.split("").map((char) => TABLE.indexOf(char));
-  return new Date(
-    Date.UTC(mem[0] * 60 + mem[1], mem[2], mem[3] + 1, mem[4], mem[5], mem[6]),
-  );
+  const v = new Array(7);
+
+  for (let i = 0; i < 7; i++) {
+    const code = base60.charCodeAt(i);
+    const val = LOOKUP[code];
+
+    if (val === 0 && base60[i] !== "0") {
+      throw new Error("Invalid character");
+    }
+
+    v[i] = val;
+  }
+
+  return new Date(Date.UTC(v[0] * 60 + v[1], v[2], v[3] + 1, v[4], v[5], v[6]));
 };
 
-export const toBase60 = (datetime) => {
-  if (!(datetime instanceof Date)) {
-    throw new Error('"datetime" is not a valid Date object');
+export const toBase60 = (date) => {
+  if (!(date instanceof Date)) {
+    throw new Error('"date" is not a valid Date object');
   }
 
-  return [
-    Math.floor(datetime.getUTCFullYear() / 60),
-    datetime.getUTCFullYear() % 60,
-    datetime.getUTCMonth(),
-    datetime.getUTCDate() - 1,
-    datetime.getUTCHours(),
-    datetime.getUTCMinutes(),
-    datetime.getUTCSeconds(),
-  ]
-    .map((num) => TABLE[num])
-    .join("");
+  const year = date.getUTCFullYear();
+
+  const chars = new Array(7);
+
+  chars[0] = TABLE[(year / 60) | 0];
+  chars[1] = TABLE[year % 60];
+  chars[2] = TABLE[date.getUTCMonth()];
+  chars[3] = TABLE[date.getUTCDate() - 1];
+  chars[4] = TABLE[date.getUTCHours()];
+  chars[5] = TABLE[date.getUTCMinutes()];
+  chars[6] = TABLE[date.getUTCSeconds()];
+
+  return chars.join("");
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtg-js",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "main": "index.js",
   "type": "module",
   "engines": {