@live-change/uid 0.1.0 → 0.1.4

package/index.js

@@ -20,7 +20,7 @@ function decodeNumber(str) {
   let out = 0
   let factor = 1
   for(let i = str.length - 1; i >= 0; i--) {
-    out += decodeCharacter(str[i])
+    out += decodeCharacter(str[i]) * factor
     factor *= characters.length
   }
   return out
@@ -28,7 +28,7 @@ function decodeNumber(str) {
 
 function encodeDate(date = new Date()) {
   return '' +
-    characters[date.getUTCFullYear() % characters.length] +
+    encodeNumber(date.getUTCFullYear()).padStart(2, '0') +
     characters[date.getUTCMonth() + 1] +
     characters[date.getUTCDate()] +
     characters[date.getUTCHours()] +
@@ -40,17 +40,13 @@ function encodeDate(date = new Date()) {
 
 function decodeDate(str = encodeDate(new Date)) {
   const date = new Date()
-  const firstYear = date.getUTCFullYear()-31
-  const firstYearNumber = firstYear % characters.length
-  let yearNumber = decodeCharacter(str[0])
-  if(yearNumber < firstYearNumber) yearNumber += characters.length
-  date.setUTCFullYear(yearNumber - firstYearNumber + firstYear)
-  date.setUTCMonth(decodeCharacter(str[1]) - 1)
-  date.setUTCDate(decodeCharacter(str[2]))
-  date.setUTCHours(decodeCharacter(str[3]))
-  date.setUTCMinutes(decodeCharacter(str[4]))
-  date.setUTCSeconds(decodeCharacter(str[5]))
-  date.setUTCMilliseconds(decodeCharacter(str[6]) * 60 + decodeCharacter(str[7]))
+  date.setUTCFullYear(decodeNumber(str.slice(0, 2)))
+  date.setUTCMonth(decodeCharacter(str[2]) - 1)
+  date.setUTCDate(decodeCharacter(str[3]))
+  date.setUTCHours(decodeCharacter(str[4]))
+  date.setUTCMinutes(decodeCharacter(str[5]))
+  date.setUTCSeconds(decodeCharacter(str[6]))
+  date.setUTCMilliseconds(decodeCharacter(str[7]) * 60 + decodeCharacter(str[7]))
   return date
 }
 
@@ -64,16 +60,16 @@ function randomString(length = 8) {
 
 function hashCode(str) {
   let hash = 0
-  if(this.length == 0) return hash
+  if(str.length == 0) return hash
   for(let i = 0; i < str.length; i++) {
     const char = str.charCodeAt(i)
     hash = ((hash << 5) - hash) + char
-    hash = hash & hash // Convert to 32bit integer
+    hash = hash | 0
   }
-  return hash
+  return Math.abs(hash)
 }
 
-function uidGenerator(fingerprint = randomString(4), numberLength = 0) {
+function uidGenerator(fingerprint = randomString(4), numberLength = 0, borders = '{}') {
   let lastMillisecond = Date.now(), lastId = 0
   function next() {
     const date = new Date()
@@ -84,7 +80,8 @@ function uidGenerator(fingerprint = randomString(4), numberLength = 0) {
       lastId = 0
       lastMillisecond = now
     }
-    return '{' + encodeDate(date) + '.' + encodeNumber(lastId).padStart(numberLength, '0') + '@' + fingerprint + '}'
+    const idPart = encodeNumber(lastId).padStart(numberLength, '0')
+    return borders[0] + encodeDate(date) + '.' + idPart + '@' + fingerprint + borders[1]
   }
 
   return next
@@ -106,7 +103,7 @@ function verifyUidSource(uid, source) {
 
 module.exports = {
   encodeDate,
-  decodeData,
+  decodeDate,
   encodeNumber,
   hashCode,
   randomString,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/uid",
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "Simple unique id generator with timestamp and source",
   "main": "index.js",
   "scripts": {
@@ -20,8 +20,6 @@
     "url": "https://github.com/live-change/uid/issues"
   },
   "homepage": "https://github.com/live-change/uid",
-  "devDependencies": {
-  },
-  "dependencies": {
-  }
+  "devDependencies": {},
+  "dependencies": {}
 }