nanoid 3.3.2 → 4.0.0

package/async/index.browser.js

@@ -1,5 +1,5 @@
-let random = async bytes => crypto.getRandomValues(new Uint8Array(bytes))
-let customAlphabet = (alphabet, defaultSize = 21) => {
+export let random = async bytes => crypto.getRandomValues(new Uint8Array(bytes))
+export let customAlphabet = (alphabet, defaultSize = 21) => {
   let mask = (2 << (Math.log(alphabet.length - 1) / Math.LN2)) - 1
   let step = -~((1.6 * mask * defaultSize) / alphabet.length)
   return async (size = defaultSize) => {
@@ -14,7 +14,7 @@ let customAlphabet = (alphabet, defaultSize = 21) => {
     }
   }
 }
-let nanoid = async (size = 21) => {
+export let nanoid = async (size = 21) => {
   let id = ''
   let bytes = crypto.getRandomValues(new Uint8Array(size))
   while (size--) {
@@ -31,4 +31,3 @@ let nanoid = async (size = 21) => {
   }
   return id
 }
-export { nanoid, customAlphabet, random }

package/async/index.js

@@ -1,8 +1,8 @@
-import crypto from 'crypto'
+import { randomFill } from 'crypto'
 import { urlAlphabet } from '../url-alphabet/index.js'
-let random = bytes =>
+export let random = bytes =>
   new Promise((resolve, reject) => {
-    crypto.randomFill(Buffer.allocUnsafe(bytes), (err, buf) => {
+    randomFill(Buffer.allocUnsafe(bytes), (err, buf) => {
       if (err) {
         reject(err)
       } else {
@@ -10,7 +10,7 @@ let random = bytes =>
       }
     })
   })
-let customAlphabet = (alphabet, defaultSize = 21) => {
+export let customAlphabet = (alphabet, defaultSize = 21) => {
   let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
   let step = Math.ceil((1.6 * mask * defaultSize) / alphabet.length)
   let tick = (id, size = defaultSize) =>
@@ -24,7 +24,7 @@ let customAlphabet = (alphabet, defaultSize = 21) => {
     })
   return size => tick('', size)
 }
-let nanoid = (size = 21) =>
+export let nanoid = (size = 21) =>
   random(size).then(bytes => {
     let id = ''
     while (size--) {
@@ -32,4 +32,3 @@ let nanoid = (size = 21) =>
     }
     return id
   })
-export { nanoid, customAlphabet, random }

package/async/index.native.js

@@ -1,7 +1,7 @@
 import { getRandomBytesAsync } from 'expo-random'
 import { urlAlphabet } from '../url-alphabet/index.js'
-let random = getRandomBytesAsync
-let customAlphabet = (alphabet, defaultSize = 21) => {
+export let random = getRandomBytesAsync
+export let customAlphabet = (alphabet, defaultSize = 21) => {
   let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
   let step = Math.ceil((1.6 * mask * defaultSize) / alphabet.length)
   let tick = (id, size = defaultSize) =>
@@ -15,7 +15,7 @@ let customAlphabet = (alphabet, defaultSize = 21) => {
     })
   return size => tick('', size)
 }
-let nanoid = (size = 21) =>
+export let nanoid = (size = 21) =>
   random(size).then(bytes => {
     let id = ''
     while (size--) {
@@ -23,4 +23,3 @@ let nanoid = (size = 21) =>
     }
     return id
   })
-export { nanoid, customAlphabet, random }

package/bin/{nanoid.cjs → nanoid.js}

@@ -1,35 +1,27 @@
 #!/usr/bin/env node
-
-let { nanoid, customAlphabet } = require('..')
-
+import { nanoid, customAlphabet } from '../index.js'
 function print(msg) {
   process.stdout.write(msg + '\n')
 }
-
 function error(msg) {
   process.stderr.write(msg + '\n')
   process.exit(1)
 }
-
 if (process.argv.includes('--help') || process.argv.includes('-h')) {
   print(`
   Usage
     $ nanoid [options]
-
   Options
     -s, --size       Generated ID size
     -a, --alphabet   Alphabet to use
     -h, --help       Show this help
-
   Examples
-    $ nano --s 15
+    $ nanoid --s 15
     S9sBF77U6sDB8Yg
-
-    $ nano --size 10 --alphabet abc
+    $ nanoid --size 10 --alphabet abc
     bcabababca`)
   process.exit()
 }
-
 let alphabet, size
 for (let i = 2; i < process.argv.length; i++) {
   let arg = process.argv[i]
@@ -46,7 +38,6 @@ for (let i = 2; i < process.argv.length; i++) {
     error('Unknown argument ' + arg)
   }
 }
-
 if (alphabet) {
   let customNanoid = customAlphabet(alphabet, size)
   print(customNanoid())

package/index.browser.js

@@ -1,6 +1,6 @@
-import { urlAlphabet } from './url-alphabet/index.js'
-let random = bytes => crypto.getRandomValues(new Uint8Array(bytes))
-let customRandom = (alphabet, defaultSize, getRandom) => {
+export { urlAlphabet } from './url-alphabet/index.js'
+export let random = bytes => crypto.getRandomValues(new Uint8Array(bytes))
+export let customRandom = (alphabet, defaultSize, getRandom) => {
   let mask = (2 << (Math.log(alphabet.length - 1) / Math.LN2)) - 1
   let step = -~((1.6 * mask * defaultSize) / alphabet.length)
   return (size = defaultSize) => {
@@ -15,23 +15,19 @@ let customRandom = (alphabet, defaultSize, getRandom) => {
     }
   }
 }
-let customAlphabet = (alphabet, size = 21) =>
+export let customAlphabet = (alphabet, size = 21) =>
   customRandom(alphabet, size, random)
-let nanoid = (size = 21) => {
-  let id = ''
-  let bytes = crypto.getRandomValues(new Uint8Array(size))
-  while (size--) {
-    let byte = bytes[size] & 63
+export let nanoid = (size = 21) =>
+  crypto.getRandomValues(new Uint8Array(size)).reduce((id, byte) => {
+    byte &= 63
     if (byte < 36) {
       id += byte.toString(36)
     } else if (byte < 62) {
       id += (byte - 26).toString(36).toUpperCase()
-    } else if (byte < 63) {
-      id += '_'
-    } else {
+    } else if (byte > 62) {
       id += '-'
+    } else {
+      id += '_'
     }
-  }
-  return id
-}
-export { nanoid, customAlphabet, customRandom, urlAlphabet, random }
+    return id
+  }, '')

package/index.js

@@ -1,23 +1,24 @@
-import crypto from 'crypto'
+import { randomFillSync } from 'crypto'
 import { urlAlphabet } from './url-alphabet/index.js'
+export { urlAlphabet }
 const POOL_SIZE_MULTIPLIER = 128
 let pool, poolOffset
 let fillPool = bytes => {
   if (!pool || pool.length < bytes) {
     pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER)
-    crypto.randomFillSync(pool)
+    randomFillSync(pool)
     poolOffset = 0
   } else if (poolOffset + bytes > pool.length) {
-    crypto.randomFillSync(pool)
+    randomFillSync(pool)
     poolOffset = 0
   }
   poolOffset += bytes
 }
-let random = bytes => {
+export let random = bytes => {
   fillPool((bytes -= 0))
   return pool.subarray(poolOffset - bytes, poolOffset)
 }
-let customRandom = (alphabet, defaultSize, getRandom) => {
+export let customRandom = (alphabet, defaultSize, getRandom) => {
   let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
   let step = Math.ceil((1.6 * mask * defaultSize) / alphabet.length)
   return (size = defaultSize) => {
@@ -32,9 +33,9 @@ let customRandom = (alphabet, defaultSize, getRandom) => {
     }
   }
 }
-let customAlphabet = (alphabet, size = 21) =>
+export let customAlphabet = (alphabet, size = 21) =>
   customRandom(alphabet, size, random)
-let nanoid = (size = 21) => {
+export let nanoid = (size = 21) => {
   fillPool((size -= 0))
   let id = ''
   for (let i = poolOffset - size; i < poolOffset; i++) {
@@ -42,4 +43,3 @@ let nanoid = (size = 21) => {
   }
   return id
 }
-export { nanoid, customAlphabet, customRandom, urlAlphabet, random }

package/nanoid.js

@@ -1 +1 @@
-export let nanoid=(t=21)=>{let e="",r=crypto.getRandomValues(new Uint8Array(t));for(;t--;){let n=63&r[t];e+=n<36?n.toString(36):n<62?(n-26).toString(36).toUpperCase():n<63?"_":"-"}return e};
+export let nanoid=(t=21)=>crypto.getRandomValues(new Uint8Array(t)).reduce(((t,e)=>t+=(e&=63)<36?e.toString(36):e<62?(e-26).toString(36).toUpperCase():e>62?"-":"_"),"");

package/non-secure/index.js

@@ -1,6 +1,6 @@
 let urlAlphabet =
   'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
-let customAlphabet = (alphabet, defaultSize = 21) => {
+export let customAlphabet = (alphabet, defaultSize = 21) => {
   return (size = defaultSize) => {
     let id = ''
     let i = size
@@ -10,7 +10,7 @@ let customAlphabet = (alphabet, defaultSize = 21) => {
     return id
   }
 }
-let nanoid = (size = 21) => {
+export let nanoid = (size = 21) => {
   let id = ''
   let i = size
   while (i--) {
@@ -18,4 +18,3 @@ let nanoid = (size = 21) => {
   }
   return id
 }
-export { nanoid, customAlphabet }

package/package.json

@@ -1,60 +1,41 @@
 {
   "name": "nanoid",
-  "version": "3.3.2",
-  "description": "A tiny (130 bytes), secure URL-friendly unique string ID generator",
+  "version": "4.0.0",
+  "description": "A tiny (116 bytes), secure URL-friendly unique string ID generator",
   "keywords": [
     "uuid",
     "random",
     "id",
     "url"
   ],
+  "type": "module",
   "engines": {
-    "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+    "node": "^14 || ^16 || >=18"
   },
   "author": "Andrey Sitnik <andrey@sitnik.ru>",
   "license": "MIT",
   "repository": "ai/nanoid",
-  "browser": {
-    "./index.js": "./index.browser.js",
-    "./async/index.js": "./async/index.browser.js",
-    "./async/index.cjs": "./async/index.browser.cjs",
-    "./index.cjs": "./index.browser.cjs"
-  },
-  "react-native": "index.js",
-  "bin": "./bin/nanoid.cjs",
-  "sideEffects": false,
-  "types": "./index.d.ts",
-  "type": "module",
-  "main": "index.cjs",
-  "module": "index.js",
   "exports": {
     ".": {
-      "types": "./index.d.ts",
       "browser": "./index.browser.js",
-      "require": "./index.cjs",
-      "import": "./index.js",
       "default": "./index.js"
     },
-    "./index.d.ts": "./index.d.ts",
-    "./package.json": "./package.json",
-    "./async/package.json": "./async/package.json",
     "./async": {
       "browser": "./async/index.browser.js",
-      "require": "./async/index.cjs",
-      "import": "./async/index.js",
       "default": "./async/index.js"
     },
-    "./url-alphabet/package.json": "./url-alphabet/package.json",
-    "./url-alphabet": {
-      "require": "./url-alphabet/index.cjs",
-      "import": "./url-alphabet/index.js",
-      "default": "./url-alphabet/index.js"
-    },
-    "./non-secure/package.json": "./non-secure/package.json",
-    "./non-secure": {
-      "require": "./non-secure/index.cjs",
-      "import": "./non-secure/index.js",
-      "default": "./non-secure/index.js"
-    }
-  }
-}
+    "./non-secure": "./non-secure/index.js",
+    "./package.json": "./package.json"
+  },
+  "browser": {
+    "./index.js": "./index.browser.js",
+    "./async/index.js": "./async/index.browser.js",
+    "./async/index.cjs": "./async/index.browser.cjs"
+  },
+  "react-native": {
+    "./async/index.js": "./async/index.native.js"
+  },
+  "bin": "./bin/nanoid.js",
+  "sideEffects": false,
+  "types": "./index.d.ts"
+}

package/url-alphabet/index.js

@@ -1,3 +1,2 @@
-let urlAlphabet =
+export const urlAlphabet =
   'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
-export { urlAlphabet }

package/async/index.browser.cjs

@@ -1,34 +0,0 @@
-let random = async bytes => crypto.getRandomValues(new Uint8Array(bytes))
-let customAlphabet = (alphabet, defaultSize = 21) => {
-  let mask = (2 << (Math.log(alphabet.length - 1) / Math.LN2)) - 1
-  let step = -~((1.6 * mask * defaultSize) / alphabet.length)
-  return async (size = defaultSize) => {
-    let id = ''
-    while (true) {
-      let bytes = crypto.getRandomValues(new Uint8Array(step))
-      let i = step
-      while (i--) {
-        id += alphabet[bytes[i] & mask] || ''
-        if (id.length === size) return id
-      }
-    }
-  }
-}
-let nanoid = async (size = 21) => {
-  let id = ''
-  let bytes = crypto.getRandomValues(new Uint8Array(size))
-  while (size--) {
-    let byte = bytes[size] & 63
-    if (byte < 36) {
-      id += byte.toString(36)
-    } else if (byte < 62) {
-      id += (byte - 26).toString(36).toUpperCase()
-    } else if (byte < 63) {
-      id += '_'
-    } else {
-      id += '-'
-    }
-  }
-  return id
-}
-module.exports = { nanoid, customAlphabet, random }

package/async/index.cjs

@@ -1,35 +0,0 @@
-let crypto = require('crypto')
-let { urlAlphabet } = require('../url-alphabet/index.cjs')
-let random = bytes =>
-  new Promise((resolve, reject) => {
-    crypto.randomFill(Buffer.allocUnsafe(bytes), (err, buf) => {
-      if (err) {
-        reject(err)
-      } else {
-        resolve(buf)
-      }
-    })
-  })
-let customAlphabet = (alphabet, defaultSize = 21) => {
-  let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
-  let step = Math.ceil((1.6 * mask * defaultSize) / alphabet.length)
-  let tick = (id, size = defaultSize) =>
-    random(step).then(bytes => {
-      let i = step
-      while (i--) {
-        id += alphabet[bytes[i] & mask] || ''
-        if (id.length === size) return id
-      }
-      return tick(id, size)
-    })
-  return size => tick('', size)
-}
-let nanoid = (size = 21) =>
-  random(size).then(bytes => {
-    let id = ''
-    while (size--) {
-      id += urlAlphabet[bytes[size] & 63]
-    }
-    return id
-  })
-module.exports = { nanoid, customAlphabet, random }

package/async/package.json

@@ -1,12 +0,0 @@
-{
-  "type": "module",
-  "main": "index.cjs",
-  "module": "index.js",
-  "react-native": {
-    "./index.js": "./index.native.js"
-  },
-  "browser": {
-    "./index.js": "./index.browser.js",
-    "./index.cjs": "./index.browser.cjs"
-  }
-}

package/index.browser.cjs

@@ -1,37 +0,0 @@
-let { urlAlphabet } = require('./url-alphabet/index.cjs')
-let random = bytes => crypto.getRandomValues(new Uint8Array(bytes))
-let customRandom = (alphabet, defaultSize, getRandom) => {
-  let mask = (2 << (Math.log(alphabet.length - 1) / Math.LN2)) - 1
-  let step = -~((1.6 * mask * defaultSize) / alphabet.length)
-  return (size = defaultSize) => {
-    let id = ''
-    while (true) {
-      let bytes = getRandom(step)
-      let j = step
-      while (j--) {
-        id += alphabet[bytes[j] & mask] || ''
-        if (id.length === size) return id
-      }
-    }
-  }
-}
-let customAlphabet = (alphabet, size = 21) =>
-  customRandom(alphabet, size, random)
-let nanoid = (size = 21) => {
-  let id = ''
-  let bytes = crypto.getRandomValues(new Uint8Array(size))
-  while (size--) {
-    let byte = bytes[size] & 63
-    if (byte < 36) {
-      id += byte.toString(36)
-    } else if (byte < 62) {
-      id += (byte - 26).toString(36).toUpperCase()
-    } else if (byte < 63) {
-      id += '_'
-    } else {
-      id += '-'
-    }
-  }
-  return id
-}
-module.exports = { nanoid, customAlphabet, customRandom, urlAlphabet, random }

package/index.cjs

@@ -1,45 +0,0 @@
-let crypto = require('crypto')
-let { urlAlphabet } = require('./url-alphabet/index.cjs')
-const POOL_SIZE_MULTIPLIER = 128
-let pool, poolOffset
-let fillPool = bytes => {
-  if (!pool || pool.length < bytes) {
-    pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER)
-    crypto.randomFillSync(pool)
-    poolOffset = 0
-  } else if (poolOffset + bytes > pool.length) {
-    crypto.randomFillSync(pool)
-    poolOffset = 0
-  }
-  poolOffset += bytes
-}
-let random = bytes => {
-  fillPool((bytes -= 0))
-  return pool.subarray(poolOffset - bytes, poolOffset)
-}
-let customRandom = (alphabet, defaultSize, getRandom) => {
-  let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
-  let step = Math.ceil((1.6 * mask * defaultSize) / alphabet.length)
-  return (size = defaultSize) => {
-    let id = ''
-    while (true) {
-      let bytes = getRandom(step)
-      let i = step
-      while (i--) {
-        id += alphabet[bytes[i] & mask] || ''
-        if (id.length === size) return id
-      }
-    }
-  }
-}
-let customAlphabet = (alphabet, size = 21) =>
-  customRandom(alphabet, size, random)
-let nanoid = (size = 21) => {
-  fillPool((size -= 0))
-  let id = ''
-  for (let i = poolOffset - size; i < poolOffset; i++) {
-    id += urlAlphabet[pool[i] & 63]
-  }
-  return id
-}
-module.exports = { nanoid, customAlphabet, customRandom, urlAlphabet, random }

package/non-secure/index.cjs

@@ -1,21 +0,0 @@
-let urlAlphabet =
-  'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
-let customAlphabet = (alphabet, defaultSize = 21) => {
-  return (size = defaultSize) => {
-    let id = ''
-    let i = size
-    while (i--) {
-      id += alphabet[(Math.random() * alphabet.length) | 0]
-    }
-    return id
-  }
-}
-let nanoid = (size = 21) => {
-  let id = ''
-  let i = size
-  while (i--) {
-    id += urlAlphabet[(Math.random() * 64) | 0]
-  }
-  return id
-}
-module.exports = { nanoid, customAlphabet }

package/non-secure/package.json

@@ -1,6 +0,0 @@
-{
-  "type": "module",
-  "main": "index.cjs",
-  "module": "index.js",
-  "react-native": "index.js"
-}

package/url-alphabet/index.cjs

@@ -1,3 +0,0 @@
-let urlAlphabet =
-  'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
-module.exports = { urlAlphabet }

package/url-alphabet/package.json

@@ -1,6 +0,0 @@
-{
-  "type": "module",
-  "main": "index.cjs",
-  "module": "index.js",
-  "react-native": "index.js"
-}