nanoid 5.1.6 → 5.1.8

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2017 Andrey Sitnik <andrey@sitnik.ru>
+Copyright 2017 Andrey Sitnik <andrey@sitnik.es>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/README.md

@@ -3,19 +3,19 @@
 <img src="https://ai.github.io/nanoid/logo.svg" align="right"
      alt="Nano ID logo by Anton Lovchikov" width="180" height="94">
 
-**English** | [日本語](./README.ja.md) | [Русский](./README.ru.md) | [简体中文](./README.zh-CN.md) | [Bahasa Indonesia](./README.id-ID.md) | [한국어](./README.ko.md)
+**English** | [日本語](./README.ja.md) | [Русский](./README.ru.md) | [简体中文](./README.zh-CN.md) | [Bahasa Indonesia](./README.id-ID.md) | [한국어](./README.ko.md) | [العربية](./README.ar.md)
 
 A tiny, secure, URL-friendly, unique string ID generator for JavaScript.
 
 > “An amazing level of senseless perfectionism,
 > which is simply impossible not to respect.”
 
-* **Small.** 118 bytes (minified and brotlied). No dependencies.
+- **Small.** 118 bytes (minified and brotlied). No dependencies.
   [Size Limit] controls the size.
-* **Safe.** It uses hardware random generator. Can be used in clusters.
-* **Short IDs.** It uses a larger alphabet than UUID (`A-Za-z0-9_-`).
+- **Safe.** It uses hardware random generator. Can be used in clusters.
+- **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
+- **Portable.** Nano ID was ported
   to over [20 programming languages](./README.md#other-programming-languages).
 
 ```js
@@ -30,9 +30,8 @@ model.id = nanoid() //=> "V1StGXR8_Z5jdHi6B-myT"
 ---
 
 [online tool]: https://gitpod.io/#https://github.com/ai/nanoid/
-[with Babel]:  https://developer.epages.com/blog/coding/how-to-transpile-node-modules-with-babel-and-webpack-in-a-monorepo/
-[Size Limit]:  https://github.com/ai/size-limit
-
+[with Babel]: https://developer.epages.com/blog/coding/how-to-transpile-node-modules-with-babel-and-webpack-in-a-monorepo/
+[Size Limit]: https://github.com/ai/size-limit
 
 ## Docs
 Read full docs **[here](https://github.com/ai/nanoid#readme)**.

package/SECURITY.md

@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+We supports only the latest version and `3.x` branch.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :x:                |
+| 3.3.x   | :white_check_mark: |
+| 3.0.x   | :x:                |
+| < 3.0   | :x:                |
+
+## Reporting a Vulnerability
+
+To report a security vulnerability, please use the [Tidelift security contact].
+Tidelift will coordinate the fix and disclosure.
+
+[Tidelift security contact]: https://tidelift.com/security

package/bin/nanoid.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import { readFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { customAlphabet, nanoid } from '../index.js'
 function print(msg) {
   process.stdout.write(msg + '\n')
@@ -7,12 +10,19 @@ function error(msg) {
   process.stderr.write(msg + '\n')
   process.exit(1)
 }
+if (process.argv.includes('--version') || process.argv.includes('-v')) {
+  let root = dirname(fileURLToPath(import.meta.url))
+  let pkg = JSON.parse(readFileSync(join(root, '..', 'package.json'), 'utf8'))
+  print(pkg.version)
+  process.exit()
+}
 if (process.argv.includes('--help') || process.argv.includes('-h')) {
   print(`Usage
   $ nanoid [options]
 Options
   -s, --size       Generated ID size
   -a, --alphabet   Alphabet to use
+  -v, --version    Show version number
   -h, --help       Show this help
 Examples
   $ nanoid -s 15

package/index.browser.js

@@ -3,16 +3,34 @@ import { urlAlphabet as scopedUrlAlphabet } from './url-alphabet/index.js'
 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.log2(alphabet.length - 1)) - 1
-  let step = -~((1.6 * mask * defaultSize) / alphabet.length)
+  let safeByteCutoff = 256 - (256 % alphabet.length)
+  if (safeByteCutoff === 256) {
+    let mask = alphabet.length - 1
+    return (size = defaultSize) => {
+      if (!size) return ''
+      let id = ''
+      while (true) {
+        let bytes = getRandom(size)
+        let j = size
+        while (j--) {
+          id += alphabet[bytes[j] & mask]
+          if (id.length >= size) return id
+        }
+      }
+    }
+  }
+  let step = Math.ceil((1.6 * 256 * defaultSize) / safeByteCutoff)
   return (size = defaultSize) => {
+    if (!size) return ''
     let id = ''
     while (true) {
       let bytes = getRandom(step)
-      let j = step | 0
+      let j = step
       while (j--) {
-        id += alphabet[bytes[j] & mask] || ''
-        if (id.length >= size) return id
+        if (bytes[j] < safeByteCutoff) {
+          id += alphabet[bytes[j] % alphabet.length]
+          if (id.length >= size) return id
+        }
       }
     }
   }

package/index.d.ts

@@ -39,7 +39,7 @@ export function nanoid<Type extends string>(size?: number): Type
  * @returns A random string generator.
  *
  * ```js
- * const { customAlphabet } = require('nanoid')
+ * import { customAlphabet } from 'nanoid'
  * const nanoid = customAlphabet('0123456789абвгдеё', 5)
  * nanoid() //=> "8ё56а"
  * ```
@@ -56,7 +56,7 @@ export function customAlphabet<Type extends string>(
  * will not be secure.
  *
  * ```js
- * import { customRandom } from 'nanoid/format'
+ * import { customRandom } from 'nanoid'
  *
  * const nanoid = customRandom('abcdef', 5, size => {
  *   const random = []
@@ -79,7 +79,7 @@ export function customRandom<Type extends string>(
   alphabet: string,
   size: number,
   random: (bytes: number) => Uint8Array
-): () => Type
+): (size?: number) => Type
 
 /**
  * URL safe symbols.

package/index.js

@@ -19,8 +19,23 @@ export function random(bytes) {
   return pool.subarray(poolOffset - bytes, poolOffset)
 }
 export function 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)
+  let safeByteCutoff = 256 - (256 % alphabet.length)
+  if (safeByteCutoff === 256) {
+    let mask = alphabet.length - 1
+    return (size = defaultSize) => {
+      if (!size) return ''
+      let id = ''
+      while (true) {
+        let bytes = getRandom(size)
+        let i = size
+        while (i--) {
+          id += alphabet[bytes[i] & mask]
+          if (id.length >= size) return id
+        }
+      }
+    }
+  }
+  let step = Math.ceil((1.6 * 256 * defaultSize) / safeByteCutoff)
   return (size = defaultSize) => {
     if (!size) return ''
     let id = ''
@@ -28,8 +43,10 @@ export function customRandom(alphabet, defaultSize, getRandom) {
       let bytes = getRandom(step)
       let i = step
       while (i--) {
-        id += alphabet[bytes[i] & mask] || ''
-        if (id.length >= size) return id
+        if (bytes[i] < safeByteCutoff) {
+          id += alphabet[bytes[i] % alphabet.length]
+          if (id.length >= size) return id
+        }
       }
     }
   }

package/nanoid.js

@@ -1 +1 @@
-let a="useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";export let nanoid=(e=21)=>{let t="",r=crypto.getRandomValues(new Uint8Array(e));for(let n=0;n<e;n++)t+=a[63&r[n]];return t};
+let a="useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";export let nanoid=(e=21)=>{let t="",r=crypto.getRandomValues(new Uint8Array(e|=0));for(;e--;)t+=a[63&r[e]];return t};

package/package.json

@@ -1,26 +1,32 @@
 {
   "name": "nanoid",
-  "version": "5.1.6",
+  "version": "5.1.8",
   "description": "A tiny (118 bytes), secure URL-friendly unique string ID generator",
   "keywords": [
-    "uuid",
-    "random",
     "id",
-    "url"
+    "random",
+    "url",
+    "uuid"
   ],
-  "type": "module",
-  "engines": {
-    "node": "^18 || >=20"
-  },
+  "license": "MIT",
+  "author": "Andrey Sitnik <andrey@sitnik.es>",
+  "repository": "ai/nanoid",
   "funding": [
     {
       "type": "github",
       "url": "https://github.com/sponsors/ai"
     }
   ],
-  "author": "Andrey Sitnik <andrey@sitnik.ru>",
-  "license": "MIT",
-  "repository": "ai/nanoid",
+  "bin": "./bin/nanoid.js",
+  "type": "module",
+  "sideEffects": false,
+  "browser": {
+    "./index.js": "./index.browser.js"
+  },
+  "types": "./index.d.ts",
+  "react-native": {
+    "./index.js": "./index.browser.js"
+  },
   "exports": {
     ".": {
       "types": "./index.d.ts",
@@ -28,16 +34,13 @@
       "react-native": "./index.browser.js",
       "default": "./index.js"
     },
-    "./non-secure": "./non-secure/index.js",
+    "./non-secure": {
+      "types": "./non-secure/index.d.ts",
+      "default": "./non-secure/index.js"
+    },
     "./package.json": "./package.json"
   },
-  "browser": {
-    "./index.js": "./index.browser.js"
-  },
-  "react-native": {
-    "./index.js": "./index.browser.js"
-  },
-  "bin": "./bin/nanoid.js",
-  "sideEffects": false,
-  "types": "./index.d.ts"
+  "engines": {
+    "node": "^18 || >=20"
+  }
 }

package/url-alphabet/index.js

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