fix biginteger errors, update deps, improve build

.gitignore

@@ -23,3 +23,4 @@ build/Release
 # Deployed apps should consider commenting this line out:
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules
+package-lock.json

Makefile

@@ -1,8 +1,16 @@
-build:
+.PHONY: build unbuild test
+
+build: src/*.coffee
+src/*.coffee:
 	cp -R lib src
-	./node_modules/.bin/coffee -c lib
-	find lib -iname "*.coffee" -exec rm '{}' ';'
+	npx coffee -c lib
+	rm lib/*.coffee
 
-unbuild:
+unbuild: lib/*.coffee
+lib/*.coffee:
 	rm -rf lib
 	mv src lib
+
+test: src/*.coffee
+	npx coffee -c test && npx mocha
+	rm test/*.js

lib/index.coffee

@@ -1,24 +1,14 @@
 BigNumber = require 'bignumber.js'
-map = require './charmap'
-
-# `map` is for converting from the number -> character parings that JS uses,
-# into the standard base64 table
-reversedMap = {}
-for i, o of map
-  reversedMap[o] = i
+BigNumber.config({
+  ALPHABET: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$_',
+});
 
 instagramIdToUrlSegment = (id) ->
-  id = (new BigNumber(id)).toString(64)
-  urlSegment = ''
-  for char in id
-    urlSegment += map[char]
-  return urlSegment
+  if (typeof id == 'number' && id > Number.MAX_SAFE_INTEGER)
+    throw ('Input value too large, please pass as string')
+  (new BigNumber(id)).toString(64).replace(/\$/g, '-')
 
 urlSegmentToInstagramId = (urlSegment) ->
-  id = ''
-  for char in urlSegment
-    id += reversedMap[char]
-  id = (new BigNumber(id, 64)).toString(10)
-  return id
+  (new BigNumber(urlSegment.replace(/-/g, '$'), 64)).toString(10)
 
 module.exports = {instagramIdToUrlSegment, urlSegmentToInstagramId}

lib/index.d.ts

@@ -0,0 +1,5 @@
+declare namespace instagramId {
+  const instagramIdToUrlSegment: (id: string) => string;
+  const urlSegmentToInstagramId: (urlSegment: string) => string;
+}
+export = instagramId

package.json

@@ -1,14 +1,14 @@
 {
   "name": "instagram-id-to-url-segment",
   "description": "Convert Instagram post IDs into Instagram links, algorithmically",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "author": "Sean Lang <[email protected]>",
   "dependencies": {
-    "bignumber.js": "^2.0.7"
+    "bignumber.js": "^9.0.1"
   },
   "devDependencies": {
-    "coffee-script": "^1.9.3",
-    "mocha": "^1.21.4",
+    "coffeescript": "^2.5.1",
+    "mocha": "^8.4.0",
     "should": "^4.0.4"
   },
   "keywords": [
@@ -21,6 +21,6 @@
   "main": "lib",
   "repository": "git://github.com/slang800/instagram-id-to-url-segment.git",
   "scripts": {
-    "test": "mocha"
+    "test": "make test; make unbuild"
   }
 }

test/index.coffee

@@ -1,37 +1,8 @@
 should = require 'should'
-BigNumber = require 'bignumber.js'
 {instagramIdToUrlSegment, urlSegmentToInstagramId} = require '../lib'
 samples = require './samples'
-map = require '../lib/charmap'
 
 describe 'instagram-id-to-url-segment', ->
-  it 'should have a correct internal charmap', ->
-    # this is for mapping from the JS number conversion charmap to the base64
-    # alphabet
-    CHAR_MAPS = [
-      [[0, 25], [65, 90]] # (uppercase) 36 - 52 becomes 65 - 90
-      [[26, 51], [97, 122]] # (lowercase) 10 - 35 becomes 97 - 122
-      [[52, 61], [48, 57]] # (number) 0 - 9 becomes 48 - 57
-      [[62, 62], [45, 45]] # (hyphen) 62 becomes 45
-      [[63, 63], [95, 95]] # (underscore) 63 becomes 95
-    ]
-
-    mapChar = (char, reverse = false) ->
-      [from, to] = (if not reverse then [0, 1] else [1, 0])
-
-      for charMap in CHAR_MAPS
-        [startRange, endRange] = charMap[from]
-        offset = charMap[to][0] - startRange
-        if startRange <= char <= endRange
-          return char + offset
-
-      throw new Error("Char #{char} not in mapping")
-
-    for char in [0...64]
-      map[new BigNumber(char).toString(64)].should.equal(
-        String.fromCharCode(mapChar(char))
-      )
-
   it 'should convert ids to URL segments', ->
     for [id, urlSegment] in samples
       instagramIdToUrlSegment(id).should.equal(urlSegment)

test/samples.json

@@ -146,5 +146,9 @@
   [
     "936303077400215759",
     "z-arAqi4DP"
+  ],
+  [
+    "2569835492808814665",
+    "COp48PgD3BJ"
   ]
 ]