Added support for multiple character sets

CHANGELOG.md

@@ -1,3 +1,7 @@
+1.3.0 / Jun 02, 2023
+==================
+  * Added support for multiple character sets
+
 1.2.3 / Oct 20, 2022
 ==================
   * Fixed React support

lib/charset.js

@@ -5,6 +5,17 @@ function Charset() {
 }
 
 Charset.prototype.setType = function(type) {
+  if (Array.isArray(type)) {
+    for (var i=0; i < type.length; i++) {
+      this.chars += this.getCharacters(type[i]);
+    }
+  }
+  else {
+    this.chars = this.getCharacters(type);
+  }
+}
+
+Charset.prototype.getCharacters = function(type) {
   var chars;
 
   var numbers     = '0123456789';
@@ -36,7 +47,7 @@ Charset.prototype.setType = function(type) {
     chars = type;
   }
 
-  this.chars = chars;
+  return chars;
 }
 
 Charset.prototype.removeUnreadable = function() {

test/index.js

@@ -90,6 +90,22 @@ describe("randomstring.generate(options)", function() {
     });
   });
 
+  it("accepts an array of charsets", function() {
+    var charset = ['alphabetic', '!'];
+    var testData = random({ length: testLength, charset: charset });
+    var search = testData.search(/[^A-Za-z!]/ig);
+    assert.equal(search, -1);
+  });
+
+  it("accepts an array of charsets async", function(done) {
+    var charset = ['alphabetic', '!'];
+    random({ length: testLength, charset: charset }, function(err, testData) {
+      var search = testData.search(/[^A-Za-z!]/ig);
+      assert.equal(search, -1);
+      done();
+    });
+  });
+
   it("accepts readable option", function() {
     var testData = random({ length: testLength, readable: true });
     var search = testData.search(/[0OIl]/g);