feat: use defaultRange for negated sets (fixes #25)

fent · fent · commit f571b6d1ce93 · 2018-02-09T19:12:32.000-05:00
diff --git a/lib/randexp.js b/lib/randexp.js
@@ -44,9 +44,9 @@ module.exports = class RandExp {
 
     // This allows expanding to include additional characters
     // for instance: RandExp.defaultRange.add(0, 65535);
-    if (regexp.defaultRange) {
-      this.defaultRange = regexp.defaultRange;
-    }
+    this.defaultRange = regexp.defaultRange ?
+      regexp.defaultRange : this.defaultRange.clone();
+
     if (regexp.randInt) {
       this.randInt = regexp.randInt;
     }
@@ -179,14 +179,14 @@ module.exports = class RandExp {
     } else if (token.type === ret.types.RANGE) {
       return new DRange(token.from, token.to);
     } else {
-      var drange = new DRange();
-      for (var i = 0; i < token.set.length; i++) {
-        var subrange = this._expand(token.set[i]);
+      let drange = new DRange();
+      for (let i = 0; i < token.set.length; i++) {
+        let subrange = this._expand(token.set[i]);
         drange.add(subrange);
         if (this.ignoreCase) {
-          for (var j = 0; j < subrange.length; j++) {
-            var code = subrange.index(j);
-            var otherCaseCode = this._toOtherCase(code);
+          for (let j = 0; j < subrange.length; j++) {
+            let code = subrange.index(j);
+            let otherCaseCode = this._toOtherCase(code);
             if (code !== otherCaseCode) {
               drange.add(otherCaseCode);
             }
@@ -196,7 +196,7 @@ module.exports = class RandExp {
       if (token.not) {
         return this.defaultRange.clone().subtract(drange);
       } else {
-        return drange;
+        return this.defaultRange.clone().intersect(drange);
       }
     }
   }
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "lib": "./lib"
   },
   "dependencies": {
-    "discontinuous-range": "1.0.0",
+    "discontinuous-range": "fent/discontinuous-range#feature\/intersect",
     "ret": "~0.2.0"
   },
   "devDependencies": {
diff --git a/test/custom-range-test.js b/test/custom-range-test.js
@@ -2,35 +2,61 @@ const assert  = require('assert');
 const RandExp = require('..');
 
 
+function genMaxChar(re) {
+  var output = re.gen();
+  var maxChar = 0;
+  for (var i = 0; i < output.length; i++) {
+    maxChar = Math.max(maxChar, output.charCodeAt(i));
+  }
+  return maxChar;
+}
+
 describe('Modify Range', () => {
-  it('Should generate unicode when we expand its range', () => {
-    var re = new RandExp(/.{100}/);
-    re.defaultRange.subtract(0, 126);
-    re.defaultRange.add(127, 65535);
-    var output = re.gen();
-    var maxChar = 0;
-    for (var i = 0; i < output.length; i++) {
-      maxChar = Math.max(maxChar, output.charCodeAt(i));
-    }
-    assert.ok(maxChar > 127, 'non-ascii characters should have been generated');
+  describe('Globally from prototpye', () => {
+    it('Should generate unicode when we expand its range', () => {
+      RandExp.prototype.defaultRange.subtract(0, 126);
+      RandExp.prototype.defaultRange.add(127, 65535);
+      var re = new RandExp(/.{100}/);
+      RandExp.prototype.defaultRange.add(0, 126);
+      RandExp.prototype.defaultRange.subtract(127, 65535);
+      var maxChar = genMaxChar(re);
+      assert.ok(maxChar >= 127, 'non-ascii characters should have been generated');
+    });
+  });
+
+  describe('From a regexp instance', () => {
+    it('Should generate unicode when we expand its range', () => {
+      var r = /[\d\D]{100}/;
+      r.defaultRange = RandExp.prototype.defaultRange.clone();
+      r.defaultRange.subtract(0, 126);
+      r.defaultRange.add(127, 65535);
+      var re = new RandExp(r);
+      var maxChar = genMaxChar(re);
+      assert.ok(maxChar >= 127, 'non-ascii characters should have been generated');
+    });
+  });
 
-    var r = /.{100}/;
-    r.defaultRange = RandExp.prototype.defaultRange.clone();
-    r.defaultRange.subtract(0, 126);
-    r.defaultRange.add(127, 65535);
-    output = RandExp.randexp(r);
-    maxChar = 0;
-    for (i = 0; i < output.length; i++) {
-      maxChar = Math.max(maxChar, output.charCodeAt(i));
-    }
-    assert.ok(maxChar > 127, 'non-ascii characters should have been generated');
+  describe('From a randexp instance', () => {
+    it('Should generate unicode when we expand its range', () => {
+      var re = new RandExp(/[\s\S]{100}/);
+      var maxChar = genMaxChar(re);
+      assert.ok(maxChar < 127, 'ascii characters should have been generated');
+      re.defaultRange.subtract(0, 126);
+      re.defaultRange.add(127, 65535);
+      maxChar = genMaxChar(re);
+      assert.ok(maxChar >= 127, 'non-ascii characters should have been generated');
+    });
 
-    re = new RandExp(/.{100}/);
-    output = re.gen();
-    maxChar = 0;
-    for (i = 0; i < output.length; i++) {
-      maxChar = Math.max(maxChar, output.charCodeAt(i));
-    }
-    assert.ok(maxChar <= 127, 'ascii characters should have been generated');
+    describe('With a negated set', () => {
+      it('Should still generate only ascii', () => {
+        var re = new RandExp(/[^a]{100}/);
+        var maxChar = genMaxChar(re);
+        assert.ok(maxChar < 127, 'ascii characters should have been generated');
+        re.defaultRange.subtract(0, 126);
+        re.defaultRange.add(127, 65535);
+        maxChar = genMaxChar(re);
+        assert.ok(maxChar >= 127, 'non-ascii characters should have been generated');
+      });
+    });
   });
 });
