hashids - npm Package Compare versions

Comparing version 1.1.1 to 1.1.2

CHANGELOG.md

 
 # CHANGELOG
 
+**1.1.2**:
+
+- fixed issue with sourceMappingURL in hashids.min.js ([PR #38](https://github.com/ivanakimov/hashids.js/pull/38))
+- added `package-lock.json`
+
 **1.1.1**:
@@ -5,0 +10,0 @@

dist/hashids.js

@@ -46,5 +46,5 @@ (function (global, factory) {
 		function Hashids() {
-			var salt = arguments.length <= 0 || arguments[0] === undefined ? '' : arguments[0];
-			var minLength = arguments.length <= 1 || arguments[1] === undefined ? 0 : arguments[1];
-			var alphabet = arguments.length <= 2 || arguments[2] === undefined ? 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890' : arguments[2];
+			var salt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+			var minLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+			var alphabet = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
 
@@ -330,13 +330,17 @@ _classCallCheck(this, Hashids);
 
+				alphabet = alphabet.split("");
+
 				for (var i = alphabet.length - 1, v = 0, p = 0, j = 0; i > 0; i--, v++) {
 
 					v %= salt.length;
-					p += integer = salt.charAt(v).charCodeAt(0);
+					p += integer = salt.charCodeAt(v);
 					j = (integer + v + p) % i;
 
 					var tmp = alphabet[j];
-					alphabet = alphabet.substr(0, j) + alphabet.charAt(i) + alphabet.substr(j + 1);
-					alphabet = alphabet.substr(0, i) + tmp + alphabet.substr(i + 1);
+					alphabet[j] = alphabet[i];
+					alphabet[i] = tmp;
 				}
 
+				alphabet = alphabet.join("");
+
 				return alphabet;
@@ -361,10 +365,7 @@ }
 
-				var number = 0;
-
-				for (var i = 0; i < input.length; i++) {
-					var pos = alphabet.indexOf(input[i]);
-					number += pos * Math.pow(alphabet.length, input.length - i - 1);
-				}
-
-				return number;
+				return input.split("").map(function (item) {
+					return alphabet.indexOf(item);
+				}).reduce(function (carry, item) {
+					return carry * alphabet.length + item;
+				}, 0);
 			}
@@ -371,0 +372,0 @@ }]);

dist/hashids.min.js

@@ -1,2 +0,2 @@
-!function(t,e){if("function"==typeof define&&define.amd)define(["module","exports"],e);else if("undefined"!=typeof exports)e(module,exports);else{var s={exports:{}};e(s,s.exports),t.Hashids=s.exports}}(this,function(t,e){"use strict";function s(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var h=function(){function t(t,e){for(var s=0;s<e.length;s++){var h=e[s];h.enumerable=h.enumerable||!1,h.configurable=!0,"value"in h&&(h.writable=!0),Object.defineProperty(t,h.key,h)}}return function(e,s,h){return s&&t(e.prototype,s),h&&t(e,h),e}}(),r=function(){function t(){var e=arguments.length<=0||void 0===arguments[0]?"":arguments[0],h=arguments.length<=1||void 0===arguments[1]?0:arguments[1],r=arguments.length<=2||void 0===arguments[2]?"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890":arguments[2];s(this,t);var a=16,n=3.5,i=12,l="error: alphabet must contain at least X unique characters",u="error: alphabet cannot contain spaces",p="",o=void 0,f=void 0;this.escapeRegExp=function(t){return t.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},this.parseInt=function(t,e){return/^(\-|\+)?([0-9]+|Infinity)$/.test(t)?parseInt(t,e):NaN},this.seps="cfhistuCFHISTU",this.minLength=parseInt(h,10)>0?h:0,this.salt="string"==typeof e?e:"","string"==typeof r&&(this.alphabet=r);for(var g=0;g!==this.alphabet.length;g++)p.indexOf(this.alphabet.charAt(g))===-1&&(p+=this.alphabet.charAt(g));if(this.alphabet=p,this.alphabet.length<a)throw l.replace("X",a);if(this.alphabet.search(" ")!==-1)throw u;for(var c=0;c!==this.seps.length;c++){var b=this.alphabet.indexOf(this.seps.charAt(c));b===-1?this.seps=this.seps.substr(0,c)+" "+this.seps.substr(c+1):this.alphabet=this.alphabet.substr(0,b)+" "+this.alphabet.substr(b+1)}this.alphabet=this.alphabet.replace(/ /g,""),this.seps=this.seps.replace(/ /g,""),this.seps=this._shuffle(this.seps,this.salt),(!this.seps.length||this.alphabet.length/this.seps.length>n)&&(o=Math.ceil(this.alphabet.length/n),o>this.seps.length&&(f=o-this.seps.length,this.seps+=this.alphabet.substr(0,f),this.alphabet=this.alphabet.substr(f))),this.alphabet=this._shuffle(this.alphabet,this.salt);var d=Math.ceil(this.alphabet.length/i);this.alphabet.length<3?(this.guards=this.seps.substr(0,d),this.seps=this.seps.substr(d)):(this.guards=this.alphabet.substr(0,d),this.alphabet=this.alphabet.substr(d))}return h(t,[{key:"encode",value:function(){for(var t=arguments.length,e=Array(t),s=0;s<t;s++)e[s]=arguments[s];var h="";if(!e.length)return h;if(e[0]&&e[0].constructor===Array&&(e=e[0],!e.length))return h;for(var r=0;r!==e.length;r++)if(e[r]=this.parseInt(e[r],10),!(e[r]>=0))return h;return this._encode(e)}},{key:"decode",value:function(t){var e=[];return t&&t.length&&"string"==typeof t?this._decode(t,this.alphabet):e}},{key:"encodeHex",value:function(t){if(t=t.toString(),!/^[0-9a-fA-F]+$/.test(t))return"";for(var e=t.match(/[\w\W]{1,12}/g),s=0;s!==e.length;s++)e[s]=parseInt("1"+e[s],16);return this.encode.apply(this,e)}},{key:"decodeHex",value:function(t){for(var e=[],s=this.decode(t),h=0;h!==s.length;h++)e+=s[h].toString(16).substr(1);return e}},{key:"_encode",value:function(t){for(var e=void 0,s=this.alphabet,h=0,r=0;r!==t.length;r++)h+=t[r]%(r+100);e=s.charAt(h%s.length);for(var a=e,n=0;n!==t.length;n++){var i=t[n],l=a+this.salt+s;s=this._shuffle(s,l.substr(0,s.length));var u=this._toAlphabet(i,s);if(e+=u,n+1<t.length){i%=u.charCodeAt(0)+n;var p=i%this.seps.length;e+=this.seps.charAt(p)}}if(e.length<this.minLength){var o=(h+e[0].charCodeAt(0))%this.guards.length,f=this.guards[o];e=f+e,e.length<this.minLength&&(o=(h+e[2].charCodeAt(0))%this.guards.length,f=this.guards[o],e+=f)}for(var g=parseInt(s.length/2,10);e.length<this.minLength;){s=this._shuffle(s,s),e=s.substr(g)+e+s.substr(0,g);var c=e.length-this.minLength;c>0&&(e=e.substr(c/2,this.minLength))}return e}},{key:"_decode",value:function(t,e){var s=[],h=0,r=new RegExp("["+this.escapeRegExp(this.guards)+"]","g"),a=t.replace(r," "),n=a.split(" ");if(3!==n.length&&2!==n.length||(h=1),a=n[h],"undefined"!=typeof a[0]){var i=a[0];a=a.substr(1),r=new RegExp("["+this.escapeRegExp(this.seps)+"]","g"),a=a.replace(r," "),n=a.split(" ");for(var l=0;l!==n.length;l++){var u=n[l],p=i+this.salt+e;e=this._shuffle(e,p.substr(0,e.length)),s.push(this._fromAlphabet(u,e))}this._encode(s)!==t&&(s=[])}return s}},{key:"_shuffle",value:function(t,e){var s=void 0;if(!e.length)return t;for(var h=t.length-1,r=0,a=0,n=0;h>0;h--,r++){r%=e.length,a+=s=e.charAt(r).charCodeAt(0),n=(s+r+a)%h;var i=t[n];t=t.substr(0,n)+t.charAt(h)+t.substr(n+1),t=t.substr(0,h)+i+t.substr(h+1)}return t}},{key:"_toAlphabet",value:function(t,e){var s="";do s=e.charAt(t%e.length)+s,t=parseInt(t/e.length,10);while(t);return s}},{key:"_fromAlphabet",value:function(t,e){for(var s=0,h=0;h<t.length;h++){var r=e.indexOf(t[h]);s+=r*Math.pow(e.length,t.length-h-1)}return s}}]),t}();e.default=r,t.exports=e.default});
-//# sourceMappingURL=dist/hashids.min.map
+!function(t,e){if("function"==typeof define&&define.amd)define(["module","exports"],e);else if("undefined"!=typeof exports)e(module,exports);else{var s={exports:{}};e(s,s.exports),t.Hashids=s.exports}}(this,function(t,e){"use strict";function s(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var h=function(){function t(t,e){for(var s=0;s<e.length;s++){var h=e[s];h.enumerable=h.enumerable||!1,h.configurable=!0,"value"in h&&(h.writable=!0),Object.defineProperty(t,h.key,h)}}return function(e,s,h){return s&&t(e.prototype,s),h&&t(e,h),e}}(),r=function(){function t(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",h=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";s(this,t);var a="error: alphabet must contain at least X unique characters",n="",i=void 0,l=void 0;this.escapeRegExp=function(t){return t.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},this.parseInt=function(t,e){return/^(\-|\+)?([0-9]+|Infinity)$/.test(t)?parseInt(t,e):NaN},this.seps="cfhistuCFHISTU",this.minLength=parseInt(h,10)>0?h:0,this.salt="string"==typeof e?e:"","string"==typeof r&&(this.alphabet=r);for(var u=0;u!==this.alphabet.length;u++)-1===n.indexOf(this.alphabet.charAt(u))&&(n+=this.alphabet.charAt(u));if(this.alphabet=n,this.alphabet.length<16)throw a.replace("X",16);if(-1!==this.alphabet.search(" "))throw"error: alphabet cannot contain spaces";for(var p=0;p!==this.seps.length;p++){var o=this.alphabet.indexOf(this.seps.charAt(p));-1===o?this.seps=this.seps.substr(0,p)+" "+this.seps.substr(p+1):this.alphabet=this.alphabet.substr(0,o)+" "+this.alphabet.substr(o+1)}this.alphabet=this.alphabet.replace(/ /g,""),this.seps=this.seps.replace(/ /g,""),this.seps=this._shuffle(this.seps,this.salt),(!this.seps.length||this.alphabet.length/this.seps.length>3.5)&&(i=Math.ceil(this.alphabet.length/3.5))>this.seps.length&&(l=i-this.seps.length,this.seps+=this.alphabet.substr(0,l),this.alphabet=this.alphabet.substr(l)),this.alphabet=this._shuffle(this.alphabet,this.salt);var f=Math.ceil(this.alphabet.length/12);this.alphabet.length<3?(this.guards=this.seps.substr(0,f),this.seps=this.seps.substr(f)):(this.guards=this.alphabet.substr(0,f),this.alphabet=this.alphabet.substr(f))}return h(t,[{key:"encode",value:function(){for(var t=arguments.length,e=Array(t),s=0;s<t;s++)e[s]=arguments[s];if(!e.length)return"";if(e[0]&&e[0].constructor===Array&&(e=e[0],!e.length))return"";for(var h=0;h!==e.length;h++)if(e[h]=this.parseInt(e[h],10),!(e[h]>=0))return"";return this._encode(e)}},{key:"decode",value:function(t){var e=[];return t&&t.length&&"string"==typeof t?this._decode(t,this.alphabet):e}},{key:"encodeHex",value:function(t){if(t=t.toString(),!/^[0-9a-fA-F]+$/.test(t))return"";for(var e=t.match(/[\w\W]{1,12}/g),s=0;s!==e.length;s++)e[s]=parseInt("1"+e[s],16);return this.encode.apply(this,e)}},{key:"decodeHex",value:function(t){for(var e=[],s=this.decode(t),h=0;h!==s.length;h++)e+=s[h].toString(16).substr(1);return e}},{key:"_encode",value:function(t){for(var e=void 0,s=this.alphabet,h=0,r=0;r!==t.length;r++)h+=t[r]%(r+100);e=s.charAt(h%s.length);for(var a=e,n=0;n!==t.length;n++){var i=t[n],l=a+this.salt+s;s=this._shuffle(s,l.substr(0,s.length));var u=this._toAlphabet(i,s);if(e+=u,n+1<t.length){i%=u.charCodeAt(0)+n;var p=i%this.seps.length;e+=this.seps.charAt(p)}}if(e.length<this.minLength){var o=(h+e[0].charCodeAt(0))%this.guards.length,f=this.guards[o];e=f+e,e.length<this.minLength&&(o=(h+e[2].charCodeAt(0))%this.guards.length,f=this.guards[o],e+=f)}for(var g=parseInt(s.length/2,10);e.length<this.minLength;){s=this._shuffle(s,s),e=s.substr(g)+e+s.substr(0,g);var c=e.length-this.minLength;c>0&&(e=e.substr(c/2,this.minLength))}return e}},{key:"_decode",value:function(t,e){var s=[],h=0,r=new RegExp("["+this.escapeRegExp(this.guards)+"]","g"),a=t.replace(r," "),n=a.split(" ");if(3!==n.length&&2!==n.length||(h=1),a=n[h],void 0!==a[0]){var i=a[0];a=a.substr(1),r=new RegExp("["+this.escapeRegExp(this.seps)+"]","g"),a=a.replace(r," "),n=a.split(" ");for(var l=0;l!==n.length;l++){var u=n[l],p=i+this.salt+e;e=this._shuffle(e,p.substr(0,e.length)),s.push(this._fromAlphabet(u,e))}this._encode(s)!==t&&(s=[])}return s}},{key:"_shuffle",value:function(t,e){var s=void 0;if(!e.length)return t;t=t.split("");for(var h=t.length-1,r=0,a=0,n=0;h>0;h--,r++){r%=e.length,a+=s=e.charCodeAt(r),n=(s+r+a)%h;var i=t[n];t[n]=t[h],t[h]=i}return t=t.join("")}},{key:"_toAlphabet",value:function(t,e){var s="";do{s=e.charAt(t%e.length)+s,t=parseInt(t/e.length,10)}while(t);return s}},{key:"_fromAlphabet",value:function(t,e){return t.split("").map(function(t){return e.indexOf(t)}).reduce(function(t,s){return t*e.length+s},0)}}]),t}();e.default=r,t.exports=e.default});
+//# sourceMappingURL=hashids.min.map

lib/hashids.js

@@ -280,14 +280,18 @@
 
+		alphabet = alphabet.split("");
+
 		for (let i = alphabet.length - 1, v = 0, p = 0, j = 0; i > 0; i--, v++) {
 
 			v %= salt.length;
-			p += integer = salt.charAt(v).charCodeAt(0);
+			p += integer = salt.charCodeAt(v);
 			j = (integer + v + p) % i;
 
 			const tmp = alphabet[j];
-			alphabet = alphabet.substr(0, j) + alphabet.charAt(i) + alphabet.substr(j + 1);
-			alphabet = alphabet.substr(0, i) + tmp + alphabet.substr(i + 1);
+			alphabet[j] = alphabet[i];
+			alphabet[i] = tmp;
 
 		}
 
+		alphabet = alphabet.join("");
+
 		return alphabet;
@@ -312,13 +316,11 @@
 
-		let number = 0;
+		return input.split("").map(
+			(item) => alphabet.indexOf(item)
+		).reduce(
+			(carry, item) => carry * alphabet.length + item,
+			0
+		);
 
-		for (let i = 0; i < input.length; i++) {
-			const pos = alphabet.indexOf(input[i]);
-			number += pos * Math.pow(alphabet.length, input.length - i - 1);
-		}
-
-		return number;
-
 	}
 
 }

package.json

@@ -5,3 +5,3 @@ {
   "description": "Generate YouTube-like ids from numbers. Use Hashids when you do not want to expose your database ids to the user.",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "homepage": "http://hashids.org/javascript",
@@ -22,3 +22,3 @@ "repository": {
     "rename:global": "sed -i '' 's/global.hashids/global.Hashids/g' dist/hashids.js",
-    "minify": "uglifyjs dist/hashids.js -o dist/hashids.min.js --source-map dist/hashids.min.map --compress --mangle",
+    "minify": "cd dist && uglifyjs hashids.js -o hashids.min.js --source-map hashids.min.map --compress --mangle",
     "build": "npm run test && npm run build:node && npm run rename:global && npm run minify",
@@ -25,0 +25,0 @@ "clean": "rm -rf coverage .nyc_output npm-debug.log",

README.md

@@ -100,2 +100,4 @@
 
+Default alphabet is `abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890`.
+
 **Encode hex instead of numbers:**
@@ -169,11 +171,6 @@
 
-Support
--------
-
-Have a question? Ping me [@IvanAkimov](http://twitter.com/ivanakimov) or [ivanakimov.com](http://ivanakimov.com)
-
 License
 -------
 
-MIT License. See the `LICENSE` file. You can use Hashids in open source projects and commercial products. Don't break the Internet. Kthxbye.
+MIT License. See the [LICENSE](LICENSE) file. You can use Hashids in open source projects and commercial products. Don't break the Internet. Kthxbye.
 
@@ -180,0 +177,0 @@ [travis-url]: https://travis-ci.org/ivanakimov/hashids.js

No alert changes

Improved metrics

Lines of code

844

increased by0.36%

Worsened metrics

Total package byte prevSize

53637

decreased by-0.69%

Number of lines in readme file

190

decreased by-1.55%

No dependency changes