Feature: Add an option to provide output.hashFunction as a function

EugeneHlushko · EugeneHlushko · commit 307566a7a122 · 2017-12-19T19:53:08.000+02:00
diff --git a/lib/util/createHash.js b/lib/util/createHash.js
@@ -38,6 +38,9 @@ class BulkUpdateDecorator {
 }
 
 module.exports = algorithm => {
+	if(typeof algorithm === "function") {
+		return new BulkUpdateDecorator(new algorithm());
+	}
 	switch(algorithm) {
 		// TODO add non-cryptographic algorithm here
 		default: return new BulkUpdateDecorator(require("crypto").createHash(algorithm));
diff --git a/package.json b/package.json
@@ -49,6 +49,7 @@
     "less": "^2.5.1",
     "less-loader": "^4.0.3",
     "lodash": "^4.17.4",
+    "metrohash": "^2.3.0",
     "mocha": "^3.2.0",
     "mocha-lcov-reporter": "^1.0.0",
     "nsp": "^2.6.1",
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -403,8 +403,15 @@
         },
         "hashFunction": {
           "description": "Algorithm used for generation the hash (see node.js crypto package)",
-          "minLength": 1,
-          "type": "string"
+          "anyOf": [
+            {
+              "type": "string",
+              "minLength": 1
+            },
+            {
+              "instanceof": "Function"
+            }
+          ]
         },
         "hashSalt": {
           "description": "Any string which is added to the hash to salt it",
diff --git a/test/configCases/custom-hash-function/metrohash/files/file1.js b/test/configCases/custom-hash-function/metrohash/files/file1.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file10.js b/test/configCases/custom-hash-function/metrohash/files/file10.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file11.js b/test/configCases/custom-hash-function/metrohash/files/file11.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file12.js b/test/configCases/custom-hash-function/metrohash/files/file12.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file13.js b/test/configCases/custom-hash-function/metrohash/files/file13.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file14.js b/test/configCases/custom-hash-function/metrohash/files/file14.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file15.js b/test/configCases/custom-hash-function/metrohash/files/file15.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file2.js b/test/configCases/custom-hash-function/metrohash/files/file2.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file3.js b/test/configCases/custom-hash-function/metrohash/files/file3.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file4.js b/test/configCases/custom-hash-function/metrohash/files/file4.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file5.js b/test/configCases/custom-hash-function/metrohash/files/file5.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file6.js b/test/configCases/custom-hash-function/metrohash/files/file6.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file7.js b/test/configCases/custom-hash-function/metrohash/files/file7.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file8.js b/test/configCases/custom-hash-function/metrohash/files/file8.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/files/file9.js b/test/configCases/custom-hash-function/metrohash/files/file9.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/metrohash/index.js b/test/configCases/custom-hash-function/metrohash/index.js
@@ -0,0 +1,8 @@
+it("should have unique ids", function () {
+	var ids = [];
+	for(var i = 1; i <= 15; i++) {
+		var id = require("./files/file" + i + ".js");
+		ids.indexOf(id).should.be.eql(-1);
+		ids.push(id);
+	}
+});
diff --git a/test/configCases/custom-hash-function/metrohash/webpack.config.js b/test/configCases/custom-hash-function/metrohash/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = [{
+	output: {
+		hashFunction: require("metrohash").MetroHash64
+	}
+}];

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ class BulkUpdateDecorator {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`module.exports = algorithm => {`
	`41`	`+ if(typeof algorithm === "function") {`
	`42`	`+ return new BulkUpdateDecorator(new algorithm());`
	`43`	`+ }`
`41`	`44`	`switch(algorithm) {`
`42`	`45`	`// TODO add non-cryptographic algorithm here`
`43`	`46`	`default: return new BulkUpdateDecorator(require("crypto").createHash(algorithm));`