Merge pull request #6 from swansontec/typescript

Typescript

.eslintrc.js

@@ -0,0 +1,17 @@
+const path = require('path')
+
+module.exports = {
+  extends: [
+    'standard-kit/lint',
+    'standard-kit/lint/typescript'
+  ],
+  parserOptions: {
+    project: path.resolve(__dirname, './tsconfig.json'),
+    tsconfigRootDir: __dirname
+  },
+  plugins: ['prettier'],
+  rules: {
+    'no-var': 'error',
+    'prettier/prettier': 'error'
+  }
+}

.gitignore

@@ -1,4 +1,15 @@
-.nyc_output
-/coverage
-/lib
-/node_modules
+# Build output:
+.nyc_output/
+coverage/
+lib/
+
+# Package managers:
+node_modules/
+npm-debug.log
+package-lock.json
+yarn-error.log
+
+# Editors:
+.DS_Store
+.idea/
+.vscode/

.nycrc.json

@@ -0,0 +1,12 @@
+{
+  "include": [
+    "src/**/*.ts"
+  ],
+  "extension": [
+    ".ts"
+  ],
+  "require": [
+    "sucrase/register"
+  ],
+  "all": true
+}

package.json

@@ -24,14 +24,14 @@
   ],
   "main": "lib/index.cjs.js",
   "module": "lib/index.js",
+  "types": "lib/src/index.d.ts",
   "scripts": {
-    "build": "rimraf lib && rollup -c",
-    "format": "eslint . --fix",
-    "lint": "eslint .",
-    "precommit": "npm run lint && npm test",
+    "build": "rimraf lib && rollup -c && tsc",
+    "format": "npm run lint -- --fix",
+    "lint": "eslint --ignore-path .gitignore --ext .js,.ts .",
+    "precommit": "npm run lint && npm test && npm run build",
     "prepare": "npm run build",
-    "pretest": "npm run build",
-    "test": "nyc mocha"
+    "test": "nyc mocha test/**/*.ts"
   },
   "husky": {
     "hooks": {
@@ -41,6 +41,11 @@
   "devDependencies": {
     "@babel/core": "^7.6.2",
     "@babel/preset-env": "^7.6.2",
+    "@babel/preset-typescript": "^7.6.0",
+    "@types/chai": "^4.2.3",
+    "@types/mocha": "^5.2.7",
+    "@typescript-eslint/eslint-plugin": "^2.3.1",
+    "@typescript-eslint/parser": "^2.3.1",
     "chai": "^4.2.0",
     "eslint": "^6.4.0",
     "eslint-config-standard-kit": "^0.14.0",
@@ -56,6 +61,9 @@
     "rollup": "^1.21.4",
     "rollup-plugin-babel": "^4.3.3",
     "rollup-plugin-filesize": "^6.2.0",
-    "rollup-plugin-uglify": "^6.0.3"
+    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-uglify": "^6.0.3",
+    "sucrase": "^3.10.1",
+    "typescript": "^3.6.3"
   }
 }

rollup.config.js

@@ -1,34 +1,40 @@
 import babel from 'rollup-plugin-babel'
 import filesize from 'rollup-plugin-filesize'
+import resolve from 'rollup-plugin-node-resolve'
 import { uglify } from 'rollup-plugin-uglify'
 
 import packageJson from './package.json'
 
+const extensions = ['.ts']
 const babelOpts = {
   babelrc: false,
+  extensions,
+  include: ['src/**/*'],
   presets: [
     [
       '@babel/preset-env',
       {
         exclude: ['transform-regenerator'],
         loose: true
       }
-    ]
+    ],
+    '@babel/typescript'
   ]
 }
+const resolveOpts = { extensions }
 
 export default [
   {
-    input: 'src/index.js',
+    input: 'src/index.ts',
     output: [
       { file: packageJson.module, format: 'esm', sourceMap: true },
       { file: packageJson.main, format: 'cjs', sourceMap: true }
     ],
-    plugins: [babel(babelOpts)]
+    plugins: [resolve(resolveOpts), babel(babelOpts)]
   },
   {
-    input: 'src/index.js',
+    input: 'src/index.ts',
     output: { file: 'lib/index.min.js', format: 'iife', name: 'rfc4648' },
-    plugins: [babel(babelOpts), uglify(), filesize()]
+    plugins: [resolve(resolveOpts), babel(babelOpts), uglify(), filesize()]
   }
 ]

src/codec.js → src/codec.ts

@@ -1,4 +1,25 @@
-export function parse(string, encoding, opts = {}) {
+/* eslint-disable @typescript-eslint/strict-boolean-expressions */
+
+export interface Encoding {
+  bits: number
+  chars: string
+  codes?: { [char: string]: number }
+}
+
+export interface ParseOptions {
+  loose?: boolean
+  out?: new (size: number) => { [index: number]: number }
+}
+
+export interface StringifyOptions {
+  pad?: boolean
+}
+
+export function parse(
+  string: string,
+  encoding: Encoding,
+  opts: ParseOptions = {}
+): Uint8Array {
   // Build the character lookup table:
   if (!encoding.codes) {
     encoding.codes = {}
@@ -24,7 +45,9 @@ export function parse(string, encoding, opts = {}) {
   }
 
   // Allocate the output:
-  const out = new (opts.out || Uint8Array)(((end * encoding.bits) / 8) | 0)
+  const out = new (opts.out || Uint8Array)(
+    ((end * encoding.bits) / 8) | 0
+  ) as Uint8Array
 
   // Parse the data:
   let bits = 0 // Number of bits currently in the buffer
@@ -56,7 +79,11 @@ export function parse(string, encoding, opts = {}) {
   return out
 }
 
-export function stringify(data, encoding, opts = {}) {
+export function stringify(
+  data: ArrayLike<number>,
+  encoding: Encoding,
+  opts: StringifyOptions = {}
+): string {
   const { pad = true } = opts
   const mask = (1 << encoding.bits) - 1
   let out = ''

src/index.ts

@@ -0,0 +1,96 @@
+/* eslint-disable @typescript-eslint/strict-boolean-expressions */
+
+import {
+  Encoding,
+  ParseOptions,
+  StringifyOptions,
+  parse,
+  stringify
+} from './codec'
+
+const base16Encoding: Encoding = {
+  chars: '0123456789ABCDEF',
+  bits: 4
+}
+
+const base32Encoding: Encoding = {
+  chars: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567',
+  bits: 5
+}
+
+const base32HexEncoding: Encoding = {
+  chars: '0123456789ABCDEFGHIJKLMNOPQRSTUV',
+  bits: 5
+}
+
+const base64Encoding: Encoding = {
+  chars: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
+  bits: 6
+}
+
+const base64UrlEncoding: Encoding = {
+  chars: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
+  bits: 6
+}
+
+export const base16 = {
+  parse(string: string, opts?: ParseOptions): Uint8Array {
+    return parse(string.toUpperCase(), base16Encoding, opts)
+  },
+
+  stringify(data: ArrayLike<number>, opts?: StringifyOptions): string {
+    return stringify(data, base16Encoding, opts)
+  }
+}
+
+export const base32 = {
+  parse(string: string, opts: ParseOptions = {}): Uint8Array {
+    return parse(
+      opts.loose
+        ? string
+            .toUpperCase()
+            .replace(/0/g, 'O')
+            .replace(/1/g, 'L')
+            .replace(/8/g, 'B')
+        : string,
+      base32Encoding,
+      opts
+    )
+  },
+
+  stringify(data: ArrayLike<number>, opts?: StringifyOptions): string {
+    return stringify(data, base32Encoding, opts)
+  }
+}
+
+export const base32hex = {
+  parse(string: string, opts?: ParseOptions): Uint8Array {
+    return parse(string, base32HexEncoding, opts)
+  },
+
+  stringify(data: ArrayLike<number>, opts?: StringifyOptions): string {
+    return stringify(data, base32HexEncoding, opts)
+  }
+}
+
+export const base64 = {
+  parse(string: string, opts?: ParseOptions): Uint8Array {
+    return parse(string, base64Encoding, opts)
+  },
+
+  stringify(data: ArrayLike<number>, opts?: StringifyOptions): string {
+    return stringify(data, base64Encoding, opts)
+  }
+}
+
+export const base64url = {
+  parse(string: string, opts?: ParseOptions): Uint8Array {
+    return parse(string, base64UrlEncoding, opts)
+  },
+
+  stringify(data: ArrayLike<number>, opts?: StringifyOptions): string {
+    return stringify(data, base64UrlEncoding, opts)
+  }
+}
+
+export const codec = { parse, stringify }