hashids - npm Package Compare versions

Comparing version 2.2.10 to 2.2.11

dist/hashids.js

@@ -1,2 +0,2 @@
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define("Hashids",[],e):"object"==typeof exports?exports.Hashids=e():t.Hashids=e()}(self,(function(){return(()=>{"use strict";var t={d:(e,s)=>{for(var i in s)t.o(s,i)&&!t.o(e,i)&&Object.defineProperty(e,i,{enumerable:!0,get:s[i]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>l});const s=t=>"bigint"==typeof t||!Number.isNaN(Number(t))&&Math.floor(Number(t))===t,i=t=>"bigint"==typeof t||t>=0&&Number.isSafeInteger(t);function n(t,e){if(0===e.length)return t;let s;const i=[...t];for(let t=i.length-1,n=0,r=0;t>0;t--,n++){n%=e.length,r+=s=e[n].codePointAt(0);const h=(s+n+r)%t,o=i[t],a=i[h];i[h]=o,i[t]=a}return i}const r=(t,e)=>t.reduce(((s,i)=>{const n=e.indexOf(i);if(-1===n)throw new Error(`The provided ID (${t.join("")}) is invalid, as it contains characters that do not exist in the alphabet (${e.join("")})`);if("bigint"==typeof s)return s*BigInt(e.length)+BigInt(n);const r=s*e.length+n;if(Number.isSafeInteger(r))return r;if("function"==typeof BigInt)return BigInt(s)*BigInt(e.length)+BigInt(n);throw new Error("Unable to decode the provided string, due to lack of support for BigInt numbers in the current environment")}),0),h=/^\+?\d+$/,o=t=>new RegExp(t.map((t=>a(t))).sort(((t,e)=>e.length-t.length)).join("|")),a=t=>t.replace(/[\s#$()*+,.?[\\\]^{|}-]/g,"\\$&");class l{constructor(t="",e=0,s="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",i="cfhistuCFHISTU"){if(this.minLength=e,"number"!=typeof e)throw new TypeError(`Hashids: Provided 'minLength' has to be a number (is ${typeof e})`);if("string"!=typeof t)throw new TypeError(`Hashids: Provided 'salt' has to be a string (is ${typeof t})`);if("string"!=typeof s)throw new TypeError(`Hashids: Provided alphabet has to be a string (is ${typeof s})`);const r=Array.from(t),h=Array.from(s),l=Array.from(i);this.salt=r;const g=[...new Set(h)];var p;if(g.length<16)throw new Error(`Hashids: alphabet must contain at least 16 unique characters, provided: ${g.join("")}`);this.alphabet=(p=l,g.filter((t=>!p.includes(t))));const c=(d=g,l.filter((t=>d.includes(t))));var d;let f,u;this.seps=n(c,r),(0===this.seps.length||this.alphabet.length/this.seps.length>3.5)&&(f=Math.ceil(this.alphabet.length/3.5),f>this.seps.length&&(u=f-this.seps.length,this.seps.push(...this.alphabet.slice(0,u)),this.alphabet=this.alphabet.slice(u))),this.alphabet=n(this.alphabet,r);const b=Math.ceil(this.alphabet.length/12);this.alphabet.length<3?(this.guards=this.seps.slice(0,b),this.seps=this.seps.slice(b)):(this.guards=this.alphabet.slice(0,b),this.alphabet=this.alphabet.slice(b)),this.guardsRegExp=o(this.guards),this.sepsRegExp=o(this.seps),this.allowedCharsRegExp=(t=>new RegExp(`^[${t.map((t=>a(t))).sort(((t,e)=>e.length-t.length)).join("")}]+$`))([...this.alphabet,...this.guards,...this.seps])}encode(t,...e){let n=Array.isArray(t)?t:[...null!=t?[t]:[],...e];return 0===n.length?"":(n.every(s)||(n=n.map((t=>{return"bigint"==typeof t||"number"==typeof t?t:(e=String(t),h.test(e)?Number.parseInt(e,10):Number.NaN);var e}))),n.every(i)?this._encode(n).join(""):"")}decode(t){return t&&"string"==typeof t&&0!==t.length?this._decode(t):[]}encodeHex(t){let e=t;switch(typeof e){case"bigint":e=e.toString(16);break;case"string":if(!/^[\dA-Fa-f]+$/.test(e))return"";break;default:throw new Error(`Hashids: The provided value is neither a string, nor a BigInt (got: ${typeof e})`)}const s=(i=e,12,n=t=>Number.parseInt(`1${t}`,16),Array.from({length:Math.ceil(i.length/12)},((t,e)=>n(i.slice(12*e,12*(e+1))))));var i,n;return this.encode(s)}decodeHex(t){return this.decode(t).map((t=>t.toString(16).slice(1))).join("")}isValidId(t){return this.allowedCharsRegExp.test(t)}_encode(t){let{alphabet:e}=this;const s=t.reduce(((t,e,s)=>t+("bigint"==typeof e?Number(e%BigInt(s+100)):e%(s+100))),0);let i=[e[s%e.length]];const r=[...i],{seps:h}=this,{guards:o}=this;if(t.forEach(((s,o)=>{const a=r.concat(this.salt,e);e=n(e,a);const l=((t,e)=>{const s=[];let i=t;if("bigint"==typeof i){const t=BigInt(e.length);do{s.unshift(e[Number(i%t)]),i/=t}while(i>BigInt(0))}else do{s.unshift(e[i%e.length]),i=Math.floor(i/e.length)}while(i>0);return s})(s,e);if(i.push(...l),o+1<t.length){const t=l[0].codePointAt(0)+o,e="bigint"==typeof s?Number(s%BigInt(t)):s%t;i.push(h[e%h.length])}})),i.length<this.minLength){const t=(s+i[0].codePointAt(0))%o.length;if(i.unshift(o[t]),i.length<this.minLength){const t=(s+i[2].codePointAt(0))%o.length;i.push(o[t])}}const a=Math.floor(e.length/2);for(;i.length<this.minLength;){e=n(e,e),i.unshift(...e.slice(a)),i.push(...e.slice(0,a));const t=i.length-this.minLength;if(t>0){const e=t/2;i=i.slice(e,e+this.minLength)}}return i}_decode(t){if(!this.isValidId(t))throw new Error(`The provided ID (${t}) is invalid, as it contains characters that do not exist in the alphabet (${this.guards.join("")}${this.seps.join("")}${this.alphabet.join("")})`);const e=t.split(this.guardsRegExp),s=e[3===e.length||2===e.length?1:0];if(0===s.length)return[];const i=s[Symbol.iterator]().next().value,h=s.slice(i.length).split(this.sepsRegExp);let o=this.alphabet;const a=[];for(const t of h){const e=n(o,[i,...this.salt,...o].slice(0,o.length));a.push(r(Array.from(t),e)),o=e}return this._encode(a).join("")!==t?[]:a}}return e.default})()}));
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define("Hashids",[],e):"object"==typeof exports?exports.Hashids=e():t.Hashids=e()}(self,(()=>(()=>{"use strict";var t={d:(e,s)=>{for(var i in s)t.o(s,i)&&!t.o(e,i)&&Object.defineProperty(e,i,{enumerable:!0,get:s[i]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e)},e={};t.d(e,{default:()=>l});const s=t=>"bigint"==typeof t||!Number.isNaN(Number(t))&&Math.floor(Number(t))===t,i=t=>"bigint"==typeof t||t>=0&&Number.isSafeInteger(t);function n(t,e){if(0===e.length)return t;let s;const i=[...t];for(let t=i.length-1,n=0,r=0;t>0;t--,n++){n%=e.length,r+=s=e[n].codePointAt(0);const h=(s+n+r)%t,o=i[t],a=i[h];i[h]=o,i[t]=a}return i}const r=(t,e)=>t.reduce(((s,i)=>{const n=e.indexOf(i);if(-1===n)throw new Error(`The provided ID (${t.join("")}) is invalid, as it contains characters that do not exist in the alphabet (${e.join("")})`);if("bigint"==typeof s)return s*BigInt(e.length)+BigInt(n);const r=s*e.length+n;if(Number.isSafeInteger(r))return r;if("function"==typeof BigInt)return BigInt(s)*BigInt(e.length)+BigInt(n);throw new Error("Unable to decode the provided string, due to lack of support for BigInt numbers in the current environment")}),0),h=/^\+?\d+$/,o=t=>new RegExp(t.map((t=>a(t))).sort(((t,e)=>e.length-t.length)).join("|")),a=t=>t.replace(/[\s#$()*+,.?[\\\]^{|}-]/g,"\\$&");class l{constructor(t="",e=0,s="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",i="cfhistuCFHISTU"){if(this.minLength=e,"number"!=typeof e)throw new TypeError(`Hashids: Provided 'minLength' has to be a number (is ${typeof e})`);if("string"!=typeof t)throw new TypeError(`Hashids: Provided 'salt' has to be a string (is ${typeof t})`);if("string"!=typeof s)throw new TypeError(`Hashids: Provided alphabet has to be a string (is ${typeof s})`);const r=Array.from(t),h=Array.from(s),l=Array.from(i);this.salt=r;const g=[...new Set(h)];var p;if(g.length<16)throw new Error(`Hashids: alphabet must contain at least 16 unique characters, provided: ${g.join("")}`);this.alphabet=(p=l,g.filter((t=>!p.includes(t))));const c=(d=g,l.filter((t=>d.includes(t))));var d;let f,u;this.seps=n(c,r),(0===this.seps.length||this.alphabet.length/this.seps.length>3.5)&&(f=Math.ceil(this.alphabet.length/3.5),f>this.seps.length&&(u=f-this.seps.length,this.seps.push(...this.alphabet.slice(0,u)),this.alphabet=this.alphabet.slice(u))),this.alphabet=n(this.alphabet,r);const b=Math.ceil(this.alphabet.length/12);this.alphabet.length<3?(this.guards=this.seps.slice(0,b),this.seps=this.seps.slice(b)):(this.guards=this.alphabet.slice(0,b),this.alphabet=this.alphabet.slice(b)),this.guardsRegExp=o(this.guards),this.sepsRegExp=o(this.seps),this.allowedCharsRegExp=(t=>new RegExp(`^[${t.map((t=>a(t))).sort(((t,e)=>e.length-t.length)).join("")}]+$`))([...this.alphabet,...this.guards,...this.seps])}encode(t,...e){let n=Array.isArray(t)?t:[...null!=t?[t]:[],...e];return 0===n.length?"":(n.every(s)||(n=n.map((t=>{return"bigint"==typeof t||"number"==typeof t?t:(e=String(t),h.test(e)?Number.parseInt(e,10):Number.NaN);var e}))),n.every(i)?this._encode(n).join(""):"")}decode(t){return t&&"string"==typeof t&&0!==t.length?this._decode(t):[]}encodeHex(t){let e=t;switch(typeof e){case"bigint":e=e.toString(16);break;case"string":if(!/^[\dA-Fa-f]+$/.test(e))return"";break;default:throw new Error(`Hashids: The provided value is neither a string, nor a BigInt (got: ${typeof e})`)}const s=(i=e,12,n=t=>Number.parseInt(`1${t}`,16),Array.from({length:Math.ceil(i.length/12)},((t,e)=>n(i.slice(12*e,12*(e+1))))));var i,n;return this.encode(s)}decodeHex(t){return this.decode(t).map((t=>t.toString(16).slice(1))).join("")}isValidId(t){return this.allowedCharsRegExp.test(t)}_encode(t){let{alphabet:e}=this;const s=t.reduce(((t,e,s)=>t+("bigint"==typeof e?Number(e%BigInt(s+100)):e%(s+100))),0);let i=[e[s%e.length]];const r=[...i],{seps:h}=this,{guards:o}=this;if(t.forEach(((s,o)=>{const a=r.concat(this.salt,e);e=n(e,a);const l=((t,e)=>{const s=[];let i=t;if("bigint"==typeof i){const t=BigInt(e.length);do{s.unshift(e[Number(i%t)]),i/=t}while(i>BigInt(0))}else do{s.unshift(e[i%e.length]),i=Math.floor(i/e.length)}while(i>0);return s})(s,e);if(i.push(...l),o+1<t.length){const t=l[0].codePointAt(0)+o,e="bigint"==typeof s?Number(s%BigInt(t)):s%t;i.push(h[e%h.length])}})),i.length<this.minLength){const t=(s+i[0].codePointAt(0))%o.length;if(i.unshift(o[t]),i.length<this.minLength){const t=(s+i[2].codePointAt(0))%o.length;i.push(o[t])}}const a=Math.floor(e.length/2);for(;i.length<this.minLength;){e=n(e,e),i.unshift(...e.slice(a)),i.push(...e.slice(0,a));const t=i.length-this.minLength;if(t>0){const e=t/2;i=i.slice(e,e+this.minLength)}}return i}_decode(t){if(!this.isValidId(t))throw new Error(`The provided ID (${t}) is invalid, as it contains characters that do not exist in the alphabet (${this.guards.join("")}${this.seps.join("")}${this.alphabet.join("")})`);const e=t.split(this.guardsRegExp),s=e[3===e.length||2===e.length?1:0];if(0===s.length)return[];const i=s[Symbol.iterator]().next().value,h=s.slice(i.length).split(this.sepsRegExp);let o=this.alphabet;const a=[];for(const t of h){const e=n(o,[i,...this.salt,...o].slice(0,o.length));a.push(r(Array.from(t),e)),o=e}return this._encode(a).join("")!==t?[]:a}}return e.default})()));
 //# sourceMappingURL=hashids.js.map

esm/hashids.d.ts

@@ -1,2 +0,2 @@
-import type { NumberLike } from './util';
+import type { NumberLike } from './util.js';
 export default class Hashids {
@@ -3,0 +3,0 @@ private minLength;

package.json

@@ -94,6 +94,6 @@ {
   "devDependencies": {
-    "@niieani/scaffold": "^1.3.4",
+    "@niieani/scaffold": "^1.6.7",
     "nodemark": "^0.3.0",
     "require-from-web": "^1.2.0",
-    "ts-node": "^10.4.0"
+    "ts-node": "^10.9.1"
   },
@@ -122,3 +122,4 @@ "publishConfig": {
   },
-  "version": "2.2.10"
+  "packageManager": "yarn@3.4.1",
+  "version": "2.2.11"
 }

README.md

@@ -46,3 +46,3 @@ [![hashids](http://hashids.org/public/img/hashids.gif 'Hashids')](http://hashids.org/)
 
-```javascript
+```html
 <script type="text/javascript" src="hashids.min.js"></script>
@@ -49,0 +49,0 @@ <script type="text/javascript">

src/hashids.ts

@@ -208,3 +208,3 @@ import type { NumberLike } from './util'
 
-    let ret: string[] = [alphabet[numbersIdInt % alphabet.length]]
+    let ret: string[] = [alphabet[numbersIdInt % alphabet.length]!]
     const lottery = [...ret]
@@ -224,3 +224,3 @@
       if (i + 1 < numbers.length) {
-        const charCode = last[0].codePointAt(0)! + i
+        const charCode = last[0]!.codePointAt(0)! + i
         const extraNumber =
@@ -230,3 +230,3 @@ typeof number === 'bigint'
             : number % charCode
-        ret.push(seps[extraNumber % seps.length])
+        ret.push(seps[extraNumber % seps.length]!)
       }
@@ -237,9 +237,9 @@ })
       const prefixGuardIndex =
-        (numbersIdInt + ret[0].codePointAt(0)!) % guards.length
-      ret.unshift(guards[prefixGuardIndex])
+        (numbersIdInt + ret[0]!.codePointAt(0)!) % guards.length
+      ret.unshift(guards[prefixGuardIndex]!)
 
       if (ret.length < this.minLength) {
         const suffixGuardIndex =
-          (numbersIdInt + ret[2].codePointAt(0)!) % guards.length
-        ret.push(guards[suffixGuardIndex])
+          (numbersIdInt + ret[2]!.codePointAt(0)!) % guards.length
+        ret.push(guards[suffixGuardIndex]!)
       }
@@ -276,3 +276,3 @@ }
 
-    const idBreakdown = idGuardsArray[splitIndex]
+    const idBreakdown = idGuardsArray[splitIndex]!
     if (idBreakdown.length === 0) return []
@@ -279,0 +279,0 @@

src/tests-mjs/importing.test.ts

@@ -23,2 +23,3 @@ /* eslint-disable jest/require-top-level-describe */
     p.stderr.on('data', (d) => {
+      // eslint-disable-next-line jest/no-conditional-in-test
       if (!d.toString().includes('ExperimentalWarning:')) {
@@ -25,0 +26,0 @@ console.log(d.toString())

src/tests-mjs/requiring.test.ts

@@ -23,2 +23,3 @@ /* eslint-disable jest/require-top-level-describe */
     p.stderr.on('data', (d) => {
+      // eslint-disable-next-line jest/no-conditional-in-test
       if (!d.toString().includes('ExperimentalWarning:')) {
@@ -25,0 +26,0 @@ console.log(d.toString())

src/tests/bad-input.test.ts

@@ -29,3 +29,3 @@ import Hashids from '../hashids'
     const id = hashids.encode()
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
@@ -35,3 +35,3 @@
     const id = hashids.encode([])
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
@@ -41,8 +41,8 @@
     const id = hashids.encode(-1)
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
 
   it(`should return an empty string when encoding a string with non-numeric characters`, () => {
-    expect(hashids.encode('6B')).toEqual('')
-    expect(hashids.encode('123a')).toEqual('')
+    expect(hashids.encode('6B')).toBe('')
+    expect(hashids.encode('123a')).toBe('')
   })
@@ -52,3 +52,3 @@
     const id = hashids.encode(Number.POSITIVE_INFINITY)
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
@@ -59,3 +59,3 @@
     const id = hashids.encode(null)
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
@@ -65,3 +65,3 @@
     const id = hashids.encode(Number.NaN)
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
@@ -72,3 +72,3 @@
     const id = hashids.encode(undefined)
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
@@ -78,3 +78,3 @@
     const id = hashids.encode(['z'])
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
@@ -95,3 +95,3 @@
     const id = hashids.encode('z')
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
@@ -106,3 +106,3 @@
     const id = hashids.encodeHex('z')
-    expect(id).toEqual('')
+    expect(id).toBe('')
   })
@@ -112,3 +112,3 @@
     const hex = hashids.decodeHex('f')
-    expect(hex).toEqual('')
+    expect(hex).toBe('')
   })
@@ -115,0 +115,0 @@

src/tests/min-length.test.ts

@@ -33,4 +33,4 @@ /* eslint-disable jest/expect-expect */
   it(`should work when 1000`, () => {
-    testMinLength(1000)
+    testMinLength(1_000)
   })
 })

src/tests/requiring.test.ts

@@ -1,2 +0,1 @@
-// eslint-disable-next-line import/no-relative-packages
 import ImportedHashids from '../..'
@@ -3,0 +2,0 @@

src/tests/types.d.ts

@@ -68,3 +68,3 @@ /* eslint-disable @typescript-eslint/no-explicit-any */
     (
-      subject: (callback: (...args: Array<unknown>) => void) => any,
+      subject: (callback: (...args: unknown[]) => void) => any,
       setup?: () => any,
@@ -71,0 +71,0 @@ durationMillis?: number,

src/util.ts

@@ -36,8 +36,8 @@ export type NumberLike = bigint | number
     // eslint-disable-next-line no-multi-assign
-    p += integer = saltChars[v].codePointAt(0)!
+    p += integer = saltChars[v]!.codePointAt(0)!
     const j = (integer + v + p) % i
 
     // swap characters at positions i and j
-    const a = transformed[i]
-    const b = transformed[j]
+    const a = transformed[i]!
+    const b = transformed[j]!
     transformed[j] = a
@@ -60,3 +60,3 @@ transformed[i] = b
     do {
-      id.unshift(alphabetChars[Number(value % alphabetLength)])
+      id.unshift(alphabetChars[Number(value % alphabetLength)]!)
       value /= alphabetLength
@@ -66,3 +66,3 @@ } while (value > BigInt(0))
     do {
-      id.unshift(alphabetChars[value % alphabetChars.length])
+      id.unshift(alphabetChars[value % alphabetChars.length]!)
       value = Math.floor(value / alphabetChars.length)
@@ -69,0 +69,0 @@ } while (value > 0)

No alert changes

Improved metrics

Total package byte prevSize

133199

increased by0.04%

Lines of code

1737

increased by0.06%

No dependency changes