nanoid 3.1.30 → 3.3.0

package/README.md

@@ -3,7 +3,7 @@
 <img src="https://ai.github.io/nanoid/logo.svg" align="right"
      alt="Nano ID logo by Anton Lovchikov" width="180" height="94">
 
-**English** | [Русский](./README.ru.md) | [简体中文](./README.zh-CN.md)
+**English** | [Русский](./README.ru.md) | [简体中文](./README.zh-CN.md) | [Bahasa Indonesia](./README.id-ID.md)
 
 A tiny, secure, URL-friendly, unique string ID generator for JavaScript.
 
@@ -17,7 +17,7 @@ A tiny, secure, URL-friendly, unique string ID generator for JavaScript.
 * **Short IDs.** It uses a larger alphabet than UUID (`A-Za-z0-9_-`).
   So ID size was reduced from 36 to 21 symbols.
 * **Portable.** Nano ID was ported
-  to [19 programming languages](#other-programming-languages).
+  to [20 programming languages](#other-programming-languages).
 
 ```js
 import { nanoid } from 'nanoid'

package/async/index.browser.cjs

@@ -1,21 +1,20 @@
-let random = bytes =>
-  Promise.resolve(crypto.getRandomValues(new Uint8Array(bytes)))
-let customAlphabet = (alphabet, size) => {
+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 * size) / alphabet.length)
-  return () => {
+  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 Promise.resolve(id)
+        if (id.length === size) return id
       }
     }
   }
 }
-let nanoid = (size = 21) => {
+let nanoid = async (size = 21) => {
   let id = ''
   let bytes = crypto.getRandomValues(new Uint8Array(size))
   while (size--) {
@@ -30,6 +29,6 @@ let nanoid = (size = 21) => {
       id += '-'
     }
   }
-  return Promise.resolve(id)
+  return id
 }
 module.exports = { nanoid, customAlphabet, random }

package/async/index.browser.js

@@ -1,21 +1,20 @@
-let random = bytes =>
-  Promise.resolve(crypto.getRandomValues(new Uint8Array(bytes)))
-let customAlphabet = (alphabet, size) => {
+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 * size) / alphabet.length)
-  return () => {
+  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 Promise.resolve(id)
+        if (id.length === size) return id
       }
     }
   }
 }
-let nanoid = (size = 21) => {
+let nanoid = async (size = 21) => {
   let id = ''
   let bytes = crypto.getRandomValues(new Uint8Array(size))
   while (size--) {
@@ -30,6 +29,6 @@ let nanoid = (size = 21) => {
       id += '-'
     }
   }
-  return Promise.resolve(id)
+  return id
 }
 export { nanoid, customAlphabet, random }

package/async/index.cjs

@@ -10,19 +10,19 @@ let random = bytes =>
       }
     })
   })
-let customAlphabet = (alphabet, size) => {
+let customAlphabet = (alphabet, defaultSize = 21) => {
   let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
-  let step = Math.ceil((1.6 * mask * size) / alphabet.length)
-  let tick = id =>
+  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)
+      return tick(id, size)
     })
-  return () => tick('')
+  return size => tick('', size)
 }
 let nanoid = (size = 21) =>
   random(size).then(bytes => {

package/async/index.d.ts

@@ -24,8 +24,8 @@ export function nanoid(size?: number): Promise<string>
  * will not be secure.
  *
  * @param alphabet Alphabet used to generate the ID.
- * @param size Size of the ID.
- * @returns A promise with a random string.
+ * @param defaultSize Size of the ID. The default size is 21.
+ * @returns A function that returns a promise with a random string.
  *
  * ```js
  * import { customAlphabet } from 'nanoid/async'
@@ -37,8 +37,8 @@ export function nanoid(size?: number): Promise<string>
  */
 export function customAlphabet(
   alphabet: string,
-  size: number
-): () => Promise<string>
+  defaultSize?: number
+): (size?: number) => Promise<string>
 
 /**
  * Generate an array of random bytes collected from hardware noise.

package/async/index.js

@@ -10,19 +10,19 @@ let random = bytes =>
       }
     })
   })
-let customAlphabet = (alphabet, size) => {
+let customAlphabet = (alphabet, defaultSize = 21) => {
   let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
-  let step = Math.ceil((1.6 * mask * size) / alphabet.length)
-  let tick = id =>
+  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)
+      return tick(id, size)
     })
-  return () => tick('')
+  return size => tick('', size)
 }
 let nanoid = (size = 21) =>
   random(size).then(bytes => {

package/async/index.native.js

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

package/bin/nanoid.cjs

@@ -1,5 +1,55 @@
 #!/usr/bin/env node
 
-let { nanoid } = require('..')
+let { nanoid, customAlphabet } = require('..')
 
-process.stdout.write(nanoid() + '\n')
+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
+    S9sBF77U6sDB8Yg
+
+    $ nano --size 10 --alphabet abc
+    bcabababca`)
+  process.exit()
+}
+
+let alphabet, size
+for (let i = 2; i < process.argv.length; i++) {
+  let arg = process.argv[i]
+  if (arg === '--size' || arg === '-s') {
+    size = Number(process.argv[i + 1])
+    i += 1
+    if (Number.isNaN(size) || size <= 0) {
+      error('Size must be positive integer')
+    }
+  } else if (arg === '--alphabet' || arg === '-a') {
+    alphabet = process.argv[i + 1]
+    i += 1
+  } else {
+    error('Unknown argument ' + arg)
+  }
+}
+
+if (alphabet) {
+  let customNanoid = customAlphabet(alphabet, size)
+  print(customNanoid())
+} else {
+  print(nanoid(size))
+}

package/index.browser.cjs

@@ -26,10 +26,10 @@ if (process.env.NODE_ENV !== 'production') {
   }
 }
 let random = bytes => crypto.getRandomValues(new Uint8Array(bytes))
-let customRandom = (alphabet, size, getRandom) => {
+let customRandom = (alphabet, defaultSize, getRandom) => {
   let mask = (2 << (Math.log(alphabet.length - 1) / Math.LN2)) - 1
-  let step = -~((1.6 * mask * size) / alphabet.length)
-  return () => {
+  let step = -~((1.6 * mask * defaultSize) / alphabet.length)
+  return (size = defaultSize) => {
     let id = ''
     while (true) {
       let bytes = getRandom(step)
@@ -41,7 +41,8 @@ let customRandom = (alphabet, size, getRandom) => {
     }
   }
 }
-let customAlphabet = (alphabet, size) => customRandom(alphabet, size, random)
+let customAlphabet = (alphabet, size = 21) =>
+  customRandom(alphabet, size, random)
 let nanoid = (size = 21) => {
   let id = ''
   let bytes = crypto.getRandomValues(new Uint8Array(size))

package/index.browser.js

@@ -26,10 +26,10 @@ if (process.env.NODE_ENV !== 'production') {
   }
 }
 let random = bytes => crypto.getRandomValues(new Uint8Array(bytes))
-let customRandom = (alphabet, size, getRandom) => {
+let customRandom = (alphabet, defaultSize, getRandom) => {
   let mask = (2 << (Math.log(alphabet.length - 1) / Math.LN2)) - 1
-  let step = -~((1.6 * mask * size) / alphabet.length)
-  return () => {
+  let step = -~((1.6 * mask * defaultSize) / alphabet.length)
+  return (size = defaultSize) => {
     let id = ''
     while (true) {
       let bytes = getRandom(step)
@@ -41,7 +41,8 @@ let customRandom = (alphabet, size, getRandom) => {
     }
   }
 }
-let customAlphabet = (alphabet, size) => customRandom(alphabet, size, random)
+let customAlphabet = (alphabet, size = 21) =>
+  customRandom(alphabet, size, random)
 let nanoid = (size = 21) => {
   let id = ''
   let bytes = crypto.getRandomValues(new Uint8Array(size))

package/index.cjs

@@ -14,13 +14,13 @@ let fillPool = bytes => {
   poolOffset += bytes
 }
 let random = bytes => {
-  fillPool(bytes)
+  fillPool((bytes -= 0))
   return pool.subarray(poolOffset - bytes, poolOffset)
 }
-let customRandom = (alphabet, size, getRandom) => {
+let customRandom = (alphabet, defaultSize, getRandom) => {
   let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
-  let step = Math.ceil((1.6 * mask * size) / alphabet.length)
-  return () => {
+  let step = Math.ceil((1.6 * mask * defaultSize) / alphabet.length)
+  return (size = defaultSize) => {
     let id = ''
     while (true) {
       let bytes = getRandom(step)
@@ -32,9 +32,10 @@ let customRandom = (alphabet, size, getRandom) => {
     }
   }
 }
-let customAlphabet = (alphabet, size) => customRandom(alphabet, size, random)
+let customAlphabet = (alphabet, size = 21) =>
+  customRandom(alphabet, size, random)
 let nanoid = (size = 21) => {
-  fillPool(size)
+  fillPool((size -= 0))
   let id = ''
   for (let i = poolOffset - size; i < poolOffset; i++) {
     id += urlAlphabet[pool[i] & 63]

package/index.d.ts

@@ -21,7 +21,7 @@ export function nanoid(size?: number): string
  * will not be secure.
  *
  * @param alphabet Alphabet used to generate the ID.
- * @param size Size of the ID.
+ * @param defaultSize Size of the ID. The default size is 21.
  * @returns A random string generator.
  *
  * ```js
@@ -30,7 +30,10 @@ export function nanoid(size?: number): string
  * nanoid() //=> "8ё56а"
  * ```
  */
-export function customAlphabet(alphabet: string, size: number): () => string
+export function customAlphabet(
+  alphabet: string,
+  defaultSize?: number
+): (size?: number) => string
 
 /**
  * Generate unique ID with custom random generator and alphabet.

package/index.dev.js

@@ -26,10 +26,10 @@ if (true) {
   }
 }
 let random = bytes => crypto.getRandomValues(new Uint8Array(bytes))
-let customRandom = (alphabet, size, getRandom) => {
+let customRandom = (alphabet, defaultSize, getRandom) => {
   let mask = (2 << (Math.log(alphabet.length - 1) / Math.LN2)) - 1
-  let step = -~((1.6 * mask * size) / alphabet.length)
-  return () => {
+  let step = -~((1.6 * mask * defaultSize) / alphabet.length)
+  return (size = defaultSize) => {
     let id = ''
     while (true) {
       let bytes = getRandom(step)
@@ -41,7 +41,8 @@ let customRandom = (alphabet, size, getRandom) => {
     }
   }
 }
-let customAlphabet = (alphabet, size) => customRandom(alphabet, size, random)
+let customAlphabet = (alphabet, size = 21) =>
+  customRandom(alphabet, size, random)
 let nanoid = (size = 21) => {
   let id = ''
   let bytes = crypto.getRandomValues(new Uint8Array(size))

package/index.js

@@ -14,13 +14,13 @@ let fillPool = bytes => {
   poolOffset += bytes
 }
 let random = bytes => {
-  fillPool(bytes)
+  fillPool((bytes -= 0))
   return pool.subarray(poolOffset - bytes, poolOffset)
 }
-let customRandom = (alphabet, size, getRandom) => {
+let customRandom = (alphabet, defaultSize, getRandom) => {
   let mask = (2 << (31 - Math.clz32((alphabet.length - 1) | 1))) - 1
-  let step = Math.ceil((1.6 * mask * size) / alphabet.length)
-  return () => {
+  let step = Math.ceil((1.6 * mask * defaultSize) / alphabet.length)
+  return (size = defaultSize) => {
     let id = ''
     while (true) {
       let bytes = getRandom(step)
@@ -32,9 +32,10 @@ let customRandom = (alphabet, size, getRandom) => {
     }
   }
 }
-let customAlphabet = (alphabet, size) => customRandom(alphabet, size, random)
+let customAlphabet = (alphabet, size = 21) =>
+  customRandom(alphabet, size, random)
 let nanoid = (size = 21) => {
-  fillPool(size)
+  fillPool((size -= 0))
   let id = ''
   for (let i = poolOffset - size; i < poolOffset; i++) {
     id += urlAlphabet[pool[i] & 63]

package/index.prod.js

@@ -26,10 +26,10 @@ if (false) {
   }
 }
 let random = bytes => crypto.getRandomValues(new Uint8Array(bytes))
-let customRandom = (alphabet, size, getRandom) => {
+let customRandom = (alphabet, defaultSize, getRandom) => {
   let mask = (2 << (Math.log(alphabet.length - 1) / Math.LN2)) - 1
-  let step = -~((1.6 * mask * size) / alphabet.length)
-  return () => {
+  let step = -~((1.6 * mask * defaultSize) / alphabet.length)
+  return (size = defaultSize) => {
     let id = ''
     while (true) {
       let bytes = getRandom(step)
@@ -41,7 +41,8 @@ let customRandom = (alphabet, size, getRandom) => {
     }
   }
 }
-let customAlphabet = (alphabet, size) => customRandom(alphabet, size, random)
+let customAlphabet = (alphabet, size = 21) =>
+  customRandom(alphabet, size, random)
 let nanoid = (size = 21) => {
   let id = ''
   let bytes = crypto.getRandomValues(new Uint8Array(size))

package/non-secure/index.cjs

@@ -1,7 +1,7 @@
 let urlAlphabet =
   'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
-let customAlphabet = (alphabet, size) => {
-  return () => {
+let customAlphabet = (alphabet, defaultSize = 21) => {
+  return (size = defaultSize) => {
     let id = ''
     let i = size
     while (i--) {

package/non-secure/index.d.ts

@@ -13,13 +13,13 @@
 export function nanoid(size?: number): string
 
 /**
- * Generate URL-friendly unique ID based on the custom alphabet.
+ * Generate a unique ID based on a custom alphabet.
  * This method uses the non-secure predictable random generator
  * with bigger collision probability.
  *
  * @param alphabet Alphabet used to generate the ID.
- * @param size Size of the ID.
- * @returns A random string.
+ * @param defaultSize Size of the ID. The default size is 21.
+ * @returns A random string generator.
  *
  * ```js
  * import { customAlphabet } from 'nanoid/non-secure'
@@ -27,4 +27,7 @@ export function nanoid(size?: number): string
  * model.id = //=> "8ё56а"
  * ```
  */
-export function customAlphabet(alphabet: string, size: number): () => string
+export function customAlphabet(
+  alphabet: string,
+  defaultSize?: number
+): (size?: number) => string

package/non-secure/index.js

@@ -1,7 +1,7 @@
 let urlAlphabet =
   'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
-let customAlphabet = (alphabet, size) => {
-  return () => {
+let customAlphabet = (alphabet, defaultSize = 21) => {
+  return (size = defaultSize) => {
     let id = ''
     let i = size
     while (i--) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nanoid",
-  "version": "3.1.30",
+  "version": "3.3.0",
   "description": "A tiny (130 bytes), secure URL-friendly unique string ID generator",
   "keywords": [
     "uuid",